Mercurial > hg > release > icedtea6-1.13

changeset 3181:0f903bacbe64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2062: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2062: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVAC, JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-ecj): Likewise. * NEWS: Updated.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 20 Jan 2015 05:59:48 +0000
parents 62e04f490bb4
children 72968bfeb778
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 24 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jan 20 05:59:10 2015 +0000
+++ b/ChangeLog	Tue Jan 20 05:59:48 2015 +0000
@@ -1,3 +1,17 @@
+2015-01-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2062: Unset OS before running OpenJDK build
+	* Makefile.am:
+	(ICEDTEA_UNSET): Introduce variable to
+	store unsetting of environment variables.
+	(ICEDTEA_ENV): Move JAVAC, JAVA_HOME and
+	JDK_HOME to ICEDTEA_UNSET.
+	(icedtea): Unset variables prior to running
+	$(MAKE).
+	(icedtea-debug): Likewise.
+	(icedtea-ecj): Likewise.
+	* NEWS: Updated.
+
 2014-06-10  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR1832, RH1022017: Report elliptic curves
--- a/Makefile.am	Tue Jan 20 05:59:10 2015 +0000
+++ b/Makefile.am	Tue Jan 20 05:59:48 2015 +0000
@@ -772,6 +772,12 @@
 WERROR_STATUS=false
 endif
 
+ICEDTEA_UNSET = \
+	JAVAC= \
+	JAVA_HOME= \
+	JDK_HOME= \
+	OS=
+
 ICEDTEA_ENV = \
 	ALT_JDK_IMPORT_PATH="$(BOOT_DIR)" \
 	ANT="$(ANT)" \
@@ -802,9 +808,6 @@
 	FT2_LIB="$(FREETYPE2_LIBS)" \
 	ALT_PARALLEL_COMPILE_JOBS="$(PARALLEL_JOBS)" \
 	HOTSPOT_BUILD_JOBS="$(PARALLEL_JOBS)" \
-	JAVAC="" \
-	JAVA_HOME="" \
-	JDK_HOME="" \
 	ANT_RESPECT_JAVA_HOME="TRUE" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
 	DERIVATIVE_ID="$(ICEDTEA_NAME) $(PACKAGE_VERSION)$(ICEDTEA_REV)" \
@@ -1658,7 +1661,7 @@
 stamps/icedtea.stamp: stamps/bootstrap-directory-symlink.stamp \
  $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \
  stamps/jamvm.stamp
-	$(ARCH_PREFIX) $(MAKE) -j1 \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1689,7 +1692,7 @@
 stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink.stamp \
  $(OPENJDK_TREE) stamps/cacao.stamp stamps/rewrite-rhino.stamp \
  stamps/jamvm.stamp
-	$(ARCH_PREFIX) $(MAKE) -j1 \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV) \
 	  -C openjdk \
 	  $(ICEDTEA_DEBUG_BUILD_TARGET)
@@ -2060,7 +2063,7 @@
 stamps/icedtea-ecj.stamp: stamps/bootstrap-directory-symlink-ecj.stamp \
  $(OPENJDK_ECJ_TREE) stamps/jamvm.stamp stamps/cacao.stamp \
  stamps/rewrite-rhino.stamp
-	$(ARCH_PREFIX) $(MAKE) -j1 \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(MAKE) -j1 \
 	  $(ICEDTEA_ENV_ECJ) \
 	  -C openjdk-ecj/ \
 	  $(ICEDTEA_BUILD_TARGET)
--- a/NEWS	Tue Jan 20 05:59:10 2015 +0000
+++ b/NEWS	Tue Jan 20 05:59:48 2015 +0000
@@ -22,6 +22,7 @@
   - PR1831: Drop version requirement for LCMS 2
   - PR1832, RH1022017: Report elliptic curves supported by NSS, not the SunEC library
   - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
+  - PR2062: Unset OS before running OpenJDK build
 
 New in release 1.13.5 (2014-10-14):