Index: java/openjdk7/Makefile =================================================================== --- java/openjdk7/Makefile (revision 327646) +++ java/openjdk7/Makefile (working copy) @@ -29,7 +29,6 @@ USES= iconv gmake USE_XORG+= x11 xext xi xrender xt xtst MAKE_ARGS= CC=${CC} CXX=${CXX} HOST_CC=${CC} MAKE_JOBS_UNSAFE= yes -USE_GCC= any OPTIONS_DEFINE= DEBUG POLICY TZUPDATE OPTIONS_DEFAULT= POLICY TZUPDATE @@ -86,6 +85,7 @@ MAKE_ENV+= LANG="C" \ JAVACMD=${BOOTSTRAPJDKDIR}/bin/java \ X11DIR="${LOCALBASE}" \ LOCALDIR="${LOCALBASE}" \ + COMPILER_WARNINGS_FATAL="false" \ NO_DOCS="true" \ SKIP_COMPARE_IMAGES="true" \ SKIP_FASTDEBUG_BUILD="true" \ Index: java/openjdk7/files/patch-set-clang =================================================================== --- java/openjdk7/files/patch-set-clang (revision 0) +++ java/openjdk7/files/patch-set-clang (working copy) @@ -0,0 +1,13 @@ +--- hotspot/make/bsd/makefiles/gcc.make.orig ++++ hotspot/make/bsd/makefiles/gcc.make +@@ -111,7 +111,10 @@ + CFLAGS += -fno-rtti + CFLAGS += -fno-exceptions + CFLAGS += -pthread ++# Clang does not support -fcheck-new. ++ifeq (,$(findstring clang,$(shell $(CC) -v 2>&1))) + CFLAGS += -fcheck-new ++endif + # version 4 and above support fvisibility=hidden (matches jni_x86.h file) + # except 4.1.2 gives pointless warnings that can't be disabled (afaik) + ifneq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" Property changes on: java/openjdk7/files/patch-set-clang ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: java/openjdk7/files/patch-set-jdk-clang =================================================================== --- java/openjdk7/files/patch-set-jdk-clang (revision 0) +++ java/openjdk7/files/patch-set-jdk-clang (working copy) @@ -0,0 +1,17 @@ +--- jdk/make/common/Defs-bsd.gmk.orig ++++ jdk/make/common/Defs-bsd.gmk +@@ -217,14 +217,6 @@ + LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH)) + endif + +-# If this is a --hash-style=gnu system, use --hash-style=both +-# The gnu .hash section won't work on some Linux systems like SuSE 10. +-_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu') +-ifneq ($(_HAS_HASH_STYLE_GNU),) +- LDFLAGS_HASH_STYLE = -Wl,--hash-style=both +-endif +-LDFLAGS_COMMON += $(LDFLAGS_HASH_STYLE) +- + # + # Selection of warning messages + # Property changes on: java/openjdk7/files/patch-set-jdk-clang ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: java/openjdk7/files/patch-src-solaris-native-java-net-net_util_md.c =================================================================== --- java/openjdk7/files/patch-src-solaris-native-java-net-net_util_md.c (revision 0) +++ java/openjdk7/files/patch-src-solaris-native-java-net-net_util_md.c (working copy) @@ -0,0 +1,14 @@ +--- jdk/src/solaris/native/java/net/net_util_md.c.orig ++++ jdk/src/solaris/native/java/net/net_util_md.c +@@ -118,9 +118,9 @@ + static jfieldID ni_defaultIndexID; + if (ni_class == NULL) { + jclass c = (*env)->FindClass(env, "java/net/NetworkInterface"); +- CHECK_NULL(c); ++ CHECK_NULL_RETURN(c, 0); + c = (*env)->NewGlobalRef(env, c); +- CHECK_NULL(c); ++ CHECK_NULL_RETURN(c, 0); + ni_defaultIndexID = (*env)->GetStaticFieldID( + env, c, "defaultIndex", "I"); + ni_class = c; Property changes on: java/openjdk7/files/patch-src-solaris-native-java-net-net_util_md.c ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property