Mercurial > hg > icedtea9

changeset 2601:a4e45774d101

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2066: Unset OS before running OpenJDK build 2015-01-06 Andrew John Hughes <gnu.andrew@member.fsf.org> PR2066: Unset OS before running OpenJDK build * Makefile.am: (ICEDTEA_UNSET): Introduce variable to store unsetting of environment variables. (ICEDTEA_ENV): Move JAVA_HOME and JDK_HOME to ICEDTEA_UNSET. (icedtea): Unset variables prior to running $(MAKE). (icedtea-debug): Likewise. (icedtea-boot): Likewise. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 09 Dec 2015 04:26:20 +0000
parents f988c0fa5312
children c10dffbc6204
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 24 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Dec 08 03:14:09 2015 +0000
+++ b/ChangeLog	Wed Dec 09 04:26:20 2015 +0000
@@ -1,3 +1,17 @@
+2015-01-06  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2066: Unset OS before running OpenJDK build
+	* Makefile.am:
+	(ICEDTEA_UNSET): Introduce variable to
+	store unsetting of environment variables.
+	(ICEDTEA_ENV): Move JAVA_HOME and JDK_HOME to
+	ICEDTEA_UNSET.
+	(icedtea): Unset variables prior to running
+	$(MAKE).
+	(icedtea-debug): Likewise.
+	(icedtea-boot): Likewise.
+	* NEWS: Updated.
+
 2015-12-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add G564746 to PR2691 distcc bug.
--- a/Makefile.am	Tue Dec 08 03:14:09 2015 +0000
+++ b/Makefile.am	Wed Dec 09 04:26:20 2015 +0000
@@ -367,6 +367,12 @@
 	--disable-warnings-as-errors
 endif
 
+ICEDTEA_UNSET = \
+	JAVAC= \
+	JAVA_HOME= \
+	JDK_HOME= \
+	OS=
+
 ICEDTEA_ENV = \
 	LANG="C" \
 	PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
@@ -382,8 +388,6 @@
 	LLVM_CFLAGS="$(LLVM_CFLAGS)" \
 	LLVM_LDFLAGS="$(LLVM_LDFLAGS)" \
 	LLVM_LIBS="$(LLVM_LIBS)" \
-	JAVA_HOME="" \
-	JDK_HOME="" \
 	QUIETLY="" \
 	ANT_RESPECT_JAVA_HOME="TRUE" \
 	DISTRIBUTION_ID="$(DIST_ID)" \
@@ -1553,7 +1557,7 @@
 	touch $@
 
 stamps/icedtea.stamp: stamps/icedtea-configure.stamp
-	$(ARCH_PREFIX) $(ICEDTEA_MAKE) \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(ICEDTEA_MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C $(BUILD_OUTPUT_DIR) \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1625,7 +1629,7 @@
 	touch $@
 
 stamps/icedtea-debug.stamp: stamps/icedtea-debug-configure.stamp
-	$(ARCH_PREFIX) $(ICEDTEA_MAKE) \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(ICEDTEA_MAKE) \
 	  $(ICEDTEA_ENV) \
 	  -C $(DEBUG_BUILD_OUTPUT_DIR) \
 	  $(ICEDTEA_BUILD_TARGET)
@@ -1784,7 +1788,7 @@
 	touch $@
 
 stamps/icedtea-boot.stamp: stamps/icedtea-boot-configure.stamp
-	$(ARCH_PREFIX) $(ICEDTEA_MAKE) \
+	$(ICEDTEA_UNSET) $(ARCH_PREFIX) $(ICEDTEA_MAKE) \
 	  $(ICEDTEA_ENV_BOOT) \
 	  -C $(BOOT_BUILD_OUTPUT_DIR) \
 	  images
--- a/NEWS	Tue Dec 08 03:14:09 2015 +0000
+++ b/NEWS	Wed Dec 09 04:26:20 2015 +0000
@@ -73,6 +73,7 @@
   - PR1981: Support using the system installation of libpng
   - PR1994: make dist broken
   - PR2001: Synchronise HEAD tarball paths with release branch paths
+  - PR2066: Unset OS before running OpenJDK build
   - PR2095, RH1163501: 2048-bit DH upper bound too small for Fedora infrastructure
   - PR2126: Synchronise elliptic curves in sun.security.ec.NamedCurve with those listed by NSS
   - PR2199: Support giflib 5.1.0