/hg/icedtea7: PR1765: Boot JDK on ppc64le uses differently named...

[andrew at icedtea.classpath.org]

changeset 61916c3ad26e in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=61916c3ad26e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu May 15 12:17:33 2014 +0100

	PR1765: Boot JDK on ppc64le uses differently named arch directory to final build

	2014-05-14  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		PR1765: Boot JDK on ppc64le uses differently named
		arch directory to final build
		* Makefile.am:
		(bootstrap-directory-stage1): Handle ppc64le boot
		JDK using a different arch directory to the final
		build. Make output more verbose.
		* NEWS: Updated.


diffstat:

 ChangeLog   |  10 ++++++++++
 Makefile.am |  34 ++++++++++++++++++++--------------
 NEWS        |   1 +
 3 files changed, 31 insertions(+), 14 deletions(-)

diffs (92 lines):

diff -r b7bc434d2b61 -r 61916c3ad26e ChangeLog
--- a/ChangeLog	Tue May 13 17:35:49 2014 +0100
+++ b/ChangeLog	Thu May 15 12:17:33 2014 +0100
@@ -1,3 +1,13 @@
+2014-05-14  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	PR1765: Boot JDK on ppc64le uses differently named
+	arch directory to final build
+	* Makefile.am:
+	(bootstrap-directory-stage1): Handle ppc64le boot
+	JDK using a different arch directory to the final
+	build. Make output more verbose.
+	* NEWS: Updated.
+
 2014-05-13  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	PR1763: ppc64 JIT doesn't support class data sharing
diff -r b7bc434d2b61 -r 61916c3ad26e Makefile.am
--- a/Makefile.am	Tue May 13 17:35:49 2014 +0100
+++ b/Makefile.am	Thu May 15 12:17:33 2014 +0100
@@ -1619,32 +1619,38 @@
 # bootstrap/stage1
 stamps/bootstrap-directory-stage1.stamp: stamps/native-ecj.stamp
 	mkdir -p $(STAGE1_BOOT_DIR)/bin stamps/
-	ln -sf $(JAVA) $(STAGE1_BOOT_DIR)/bin/java
+	ln -sfv $(JAVA) $(STAGE1_BOOT_DIR)/bin/java
 if JAVAH_SUPPORTS_X_OPTIONS
-	ln -sf $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah
+	ln -sfv $(JAVAH) $(STAGE1_BOOT_DIR)/bin/javah
 else
-	ln -sf ../../../javah $(STAGE1_BOOT_DIR)/bin/javah
+	ln -sfv ../../../javah $(STAGE1_BOOT_DIR)/bin/javah
 endif
-	ln -sf $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic
-	ln -sf $(JAR) $(STAGE1_BOOT_DIR)/bin/jar
-	ln -sf $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
-	ln -sf ../../../javac $(STAGE1_BOOT_DIR)/bin/javac
-	ln -sf ../../../javap $(STAGE1_BOOT_DIR)/bin/javap
+	ln -sfv $(RMIC) $(STAGE1_BOOT_DIR)/bin/rmic
+	ln -sfv $(JAR) $(STAGE1_BOOT_DIR)/bin/jar
+	ln -sfv $(NATIVE2ASCII) $(STAGE1_BOOT_DIR)/bin/native2ascii
+	ln -sfv ../../../javac $(STAGE1_BOOT_DIR)/bin/javac
+	ln -sfv ../../../javap $(STAGE1_BOOT_DIR)/bin/javap
 	mkdir -p $(STAGE1_BOOT_DIR)/lib/modules
 	mkdir -p $(STAGE1_BOOT_DIR)/jre/lib && \
 	cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar $(STAGE1_BOOT_RUNTIME) && \
 	chmod u+w $(STAGE1_BOOT_RUNTIME)
 	mkdir -p $(STAGE1_BOOT_DIR)/lib && \
 	if [ -e $(SYSTEM_JDK_DIR)/lib/tools.jar ] ; then \
-	  ln -sf $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
+	  ln -sfv $(SYSTEM_JDK_DIR)/lib/tools.jar $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	else \
-	  ln -sf $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
+	  ln -sfv $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
 	fi
-	ln -sf $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
-	  $(STAGE1_BOOT_DIR)/jre/lib/ && \
+# Workaround some older ppc64le builds installing to 'ppc64le' rather than 'ppc64'
+	if test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64le ; then \
+	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64le \
+	    $(STAGE1_BOOT_DIR)/jre/lib/$(JRE_ARCH_DIR) ; \
+	else \
+	  ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
+	    $(STAGE1_BOOT_DIR)/jre/lib/ ; \
+	fi
 	if ! test -d $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
 	  then \
-	  ln -sf ./$(JRE_ARCH_DIR) \
+	  ln -sfv ./$(JRE_ARCH_DIR) \
 	    $(STAGE1_BOOT_DIR)/jre/lib/$(INSTALL_ARCH_DIR); \
 	fi
 	mkdir -p $(STAGE1_BOOT_DIR)/include && \
@@ -1652,7 +1658,7 @@
 	  test -r $$i | continue; \
 	  i=`basename $$i`; \
 	  rm -f $(STAGE1_BOOT_DIR)/include/$$i; \
-	  ln -s $(SYSTEM_JDK_DIR)/include/$$i $(STAGE1_BOOT_DIR)/include/$$i; \
+	  ln -sv $(SYSTEM_JDK_DIR)/include/$$i $(STAGE1_BOOT_DIR)/include/$$i; \
 	done;
 	mkdir -p stamps
 	touch $@
diff -r b7bc434d2b61 -r 61916c3ad26e NEWS
--- a/NEWS	Tue May 13 17:35:49 2014 +0100
+++ b/NEWS	Thu May 15 12:17:33 2014 +0100
@@ -183,6 +183,7 @@
   - Correct placement of S8041658 fix
   - PR1762: Undefined references when building with NSS 3.16.1
   - PR1763: ppc64 JIT doesn't support class data sharing
+  - PR1765: Boot JDK on ppc64le uses differently named arch directory to final build
 
 New in release 2.5.0 (2014-XX-XX):