Mercurial > hg > icedtea7

changeset 2820:a7ee53fba321

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR 2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR * Makefile.am: (install-exec-local): Use INSTALL_ARCH_DIR rather than BUILD_ARCH_DIR as the two are not the same on x86 (i386 vs. i586) (install-data-local): Likewise. * NEWS: Updated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Tue, 14 Jul 2015 21:58:23 +0100
parents 19d189fdd81a
children d5ae2c250a3f
files ChangeLog Makefile.am NEWS
diffstat 3 files changed, 36 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Jul 14 20:53:49 2015 +0100
+++ b/ChangeLog	Tue Jul 14 21:58:23 2015 +0100
@@ -1,3 +1,14 @@
+2015-06-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2532: install stage fails where
+	BUILD_ARCH_DIR != INSTALL_ARCH_DIR
+	* Makefile.am:
+	(install-exec-local): Use INSTALL_ARCH_DIR
+	rather than BUILD_ARCH_DIR as the two are not
+	the same on x86 (i386 vs. i586)
+	(install-data-local): Likewise.
+	* NEWS: Updated.
+
 2015-05-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2531: Location of docs directory in
--- a/Makefile.am	Tue Jul 14 20:53:49 2015 +0100
+++ b/Makefile.am	Tue Jul 14 21:58:23 2015 +0100
@@ -2725,11 +2725,11 @@
 
 install-exec-local:
 	${mkinstalldirs} $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)${exec_prefix}/lib
-	${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)
-	${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)/jli
+	${mkinstalldirs} $(DESTDIR)$(includedir)/$(BUILD_OS_DIR) $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)
+	${mkinstalldirs} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib
-	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
-	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/jli
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext
 	${mkinstalldirs} $(DESTDIR)${prefix}/tapset
 	for files in $(BUILD_SDK_DIR)/bin/*; do \
@@ -2748,8 +2748,8 @@
 	  $(INSTALL_DATA) $${files} $(DESTDIR)${exec_prefix}/lib; \
 	done
 	$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/lib/jexec $(DESTDIR)${exec_prefix}/lib
-	for files in $(BUILD_SDK_DIR)/lib/$(BUILD_ARCH_DIR)/jli/*.so; do \
-	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR)/jli; \
+	for files in $(BUILD_SDK_DIR)/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli; \
 	done
 	for files in $(BUILD_SDK_DIR)/jre/bin/*; do \
 	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/bin; \
@@ -2758,17 +2758,17 @@
 	  $(INSTALL_DATA) $${files} $(DESTDIR)${prefix}/jre/lib; \
 	done
 	$(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/lib/jexec $(DESTDIR)${prefix}/jre/lib
-	for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/*.so; do \
-	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR); \
+	for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*.so; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR); \
 	done
-	for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/jli/*.so; do \
-	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/jli; \
+	for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \
+	  $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli; \
 	done
 	for vms in client server ; do \
-	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
-	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
-	    for files in $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/*.so; do \
-	      $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms}; \
+	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
+	    for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/*.so; do \
+	      $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}; \
 	    done ; \
 	  fi ; \
 	done
@@ -2784,7 +2784,7 @@
 	${mkinstalldirs} $(DESTDIR)${prefix}
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/.systemPrefs
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib
-	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
 	${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/{cmm,ext,images/cursors,management,security,zi}
 	${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1}
 	${mkinstalldirs} $(DESTDIR)${prefix}/demo
@@ -2805,13 +2805,13 @@
 	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/jvm.hprof.txt $(DESTDIR)${prefix}/jre/lib
 	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/meta-index $(DESTDIR)${prefix}/jre/lib
 	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/psfont.properties.ja $(DESTDIR)${prefix}/jre/lib
-	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/jvm.cfg \
-	  $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)
+	$(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jvm.cfg \
+	  $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)
 	for vms in client server ; do \
-	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
-	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
-	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/Xusage.txt \
-	      $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+	    ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
+	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/Xusage.txt \
+	      $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
 	  fi ; \
 	done
 	for files in $(BUILD_SDK_DIR)/jre/lib/cmm/*.pf; do \
@@ -2879,9 +2879,9 @@
 if !ENABLE_CACAO
 if !ZERO_BUILD
 	for vms in client server ; do \
-	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ] ; then \
-	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(BUILD_ARCH_DIR)/$${vms}/classes.jsa \
-	      $(DESTDIR)${prefix}/jre/lib/$(BUILD_ARCH_DIR)/$${vms} ; \
+	  if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
+	    $(INSTALL_DATA) $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms}/classes.jsa \
+	      $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ; \
 	  fi ; \
 	done
 endif
--- a/NEWS	Tue Jul 14 20:53:49 2015 +0100
+++ b/NEWS	Tue Jul 14 21:58:23 2015 +0100
@@ -327,6 +327,7 @@
   - PR2507, G541462: Only apply PaX markings by default on running PaX kernels
   - PR2530: PaX mark the installed JDK so it runs on hardened systems
   - PR2531: Location of docs directory in install-data-local is incorrect
+  - PR2532: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
 * AArch64 port
   - Add copyright to aarch64_ad.m4
   - S8069593: Changes to JavaThread::_thread_state must use acquire and release