diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-20 21:05:25 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2015-05-20 21:05:25 +0000 |
| commit | ce40d635b900299670113d51d9f4028a742aac60 (patch) | |
| tree | 70fdae593aee77409d6be9fd10b531084bff3830 /java/openjdk6 | |
| parent | - Update to 1.2.4 [1] (diff) | |
Fix build without precompiled headers and apply r384056 to java/openjdk6.
http://bugs.java.com/bugdatabase/view_bug.do?bug_id=7154517
Obtained from: OpenJDK project [1]
MFH: 2015Q2
Notes
Notes:
svn path=/head/; revision=386893
Diffstat (limited to 'java/openjdk6')
| -rw-r--r-- | java/openjdk6/Makefile | 19 | ||||
| -rw-r--r-- | java/openjdk6/files/patch-set | 10 |
2 files changed, 22 insertions, 7 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index f5c71b2fadbe..80238281ba97 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -185,6 +185,18 @@ COPYFILES= \ .include <bsd.port.pre.mk> +.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 @@ -193,13 +205,6 @@ ICONV_LDFLAGS= -L${LOCALBASE}/lib ${ICONV_LIB} .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;'`; \ diff --git a/java/openjdk6/files/patch-set b/java/openjdk6/files/patch-set index 48b18a0000d1..36f82d84bd80 100644 --- a/java/openjdk6/files/patch-set +++ b/java/openjdk6/files/patch-set @@ -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 @@ |