From owner-svn-ports-all@FreeBSD.ORG Wed May 20 21:38:32 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C43AF8F6; Wed, 20 May 2015 21:38:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9672F1A5E; Wed, 20 May 2015 21:38:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4KLcWIG020081; Wed, 20 May 2015 21:38:32 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4KLcW65020076; Wed, 20 May 2015 21:38:32 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201505202138.t4KLcW65020076@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 20 May 2015 21:38:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r386894 - in branches/2015Q2/java/openjdk6: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 May 2015 21:38:32 -0000 Author: jkim Date: Wed May 20 21:38:31 2015 New Revision: 386894 URL: https://svnweb.freebsd.org/changeset/ports/386894 Log: MFH: r386893 Fix build without precompiled headers and apply r384056 to java/openjdk6. Approved by: ports-secteam (delphij) Modified: branches/2015Q2/java/openjdk6/Makefile branches/2015Q2/java/openjdk6/files/patch-set Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/java/openjdk6/Makefile ============================================================================== --- branches/2015Q2/java/openjdk6/Makefile Wed May 20 21:05:25 2015 (r386893) +++ branches/2015Q2/java/openjdk6/Makefile Wed May 20 21:38:31 2015 (r386894) @@ -186,6 +186,18 @@ COPYFILES= \ .include +.if ${COMPILER_TYPE} == clang +.if ${COMPILER_VERSION} >= 35 +MAKE_ENV+= COMPILER_WARNINGS_FATAL=false +.endif +MAKE_ENV+= USE_CLANG=true +.endif + +# GCC is broken with PCH: https://lists.freebsd.org/pipermail/svn-src-all/2015-March/101722.html +.if ${COMPILER_TYPE} == gcc +MAKE_ENV+= USE_PRECOMPILED_HEADER=0 +.endif + .if empty(ICONV_LIB) ICONV_CPPFLAGS= -DLIBICONV_PLUG .else @@ -194,13 +206,6 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICON .endif ZLIB_LDFLAGS?= -lz -.if ${COMPILER_TYPE} == "clang" -.if ${COMPILER_VERSION} >= 35 -MAKE_ENV+= COMPILER_WARNINGS_FATAL=false -.endif -MAKE_ENV+= USE_CLANG=true -.endif - post-extract: @for d in ${COPYDIRS}; do \ ${MKDIR} `echo ${WRKSRC}/$$d | ${SED} 's/linux/bsd/g;'`; \ Modified: branches/2015Q2/java/openjdk6/files/patch-set ============================================================================== --- branches/2015Q2/java/openjdk6/files/patch-set Wed May 20 21:05:25 2015 (r386893) +++ branches/2015Q2/java/openjdk6/files/patch-set Wed May 20 21:38:31 2015 (r386894) @@ -2525,6 +2525,16 @@ #endif // PRODUCT } else { assert(_real_start_word == NULL && _real_end_word == NULL, "invariant"); +--- hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp ++++ hotspot/src/share/vm/gc_implementation/parallelScavenge/psPromotionManager.inline.hpp +@@ -25,6 +25,7 @@ + #ifndef SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + #define SHARE_VM_GC_IMPLEMENTATION_PARALLELSCAVENGE_PSPROMOTIONMANAGER_INLINE_HPP + ++#include "gc_implementation/parallelScavenge/psOldGen.hpp" + #include "gc_implementation/parallelScavenge/psPromotionManager.hpp" + #include "gc_implementation/parallelScavenge/psScavenge.hpp" + --- hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp +++ hotspot/src/share/vm/gc_implementation/shared/gcUtil.hpp @@ -144,9 +144,9 @@