RFR: JDK-8030781: System.setProperties(null) drops all system properties (RELEASE not set)

Erik Joelsson erik.joelsson at oracle.com
Tue Jan 7 13:34:09 UTC 2014


Please review this late fix for JDK 8.

System.c needs to be compiled with the macro RELEASE set to something 
meaningful. In the new build, since JDK-8001895, it gets set to the 
empty string. The reason for this is that the variable RELEASE is only 
defined in the makefiles, in spec.gmk, while the CFLAGS_JDKLIB variable 
is defined in configure. The fix is simple and posted below inline. With 
this fix, the value for RELEASE is evaluated in the makefile rather than 
in configure.

diff -r 1e1f86d5d4e2 common/autoconf/toolchain.m4
--- a/common/autoconf/toolchain.m4
+++ b/common/autoconf/toolchain.m4
@@ -936,7 +936,7 @@
    fi

    CCXXFLAGS_JDK="$CCXXFLAGS_JDK 
-DARCH='\"$OPENJDK_TARGET_CPU_LEGACY\"' -D$OPENJDK_TARGET_CPU_LEGACY"
- CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"$RELEASE\"'"
+ CCXXFLAGS_JDK="$CCXXFLAGS_JDK -DRELEASE='\"\$(RELEASE)\"'"

    CCXXFLAGS_JDK="$CCXXFLAGS_JDK \
        -I${JDK_OUTPUTDIR}/include \


/Erik



More information about the build-dev mailing list