Mercurial > hg > icedtea11
changeset 2585:837a3359425b
PR2443: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR
2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2443: 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 | Wed, 17 Jun 2015 22:39:38 +0100 |
parents | 9382763800e6 |
children | d9532d535bb7 |
files | ChangeLog Makefile.am NEWS |
diffstat | 3 files changed, 38 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 17 17:38:23 2015 +0100 +++ b/ChangeLog Wed Jun 17 22:39:38 2015 +0100 @@ -1,3 +1,14 @@ +2015-06-17 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2443: 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. + 2012-03-14 Mark Wielaard <mjw@redhat.com> PR2256: Add SystemTap tests
--- a/Makefile.am Wed Jun 17 17:38:23 2015 +0100 +++ b/Makefile.am Wed Jun 17 22:39:38 2015 +0100 @@ -2340,11 +2340,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 \ @@ -2363,11 +2363,11 @@ $(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)/*.so; do \ - $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(BUILD_ARCH_DIR); \ + for files in $(BUILD_SDK_DIR)/lib/$(INSTALL_ARCH_DIR)/*.so; do \ + $(INSTALL_PROGRAM) $${files} $(DESTDIR)${exec_prefix}/lib/$(INSTALL_ARCH_DIR); \ done - 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; \ @@ -2376,17 +2376,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 @@ -2404,7 +2404,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} ${mkinstalldirs} $(DESTDIR)$(mandir)/{man1,ja_JP.UTF-8/man1} ${mkinstalldirs} $(DESTDIR)${prefix}/demo @@ -2423,13 +2423,13 @@ $(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/tzdb.dat $(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 \ @@ -2496,9 +2496,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 Wed Jun 17 17:38:23 2015 +0100 +++ b/NEWS Wed Jun 17 22:39:38 2015 +0100 @@ -108,6 +108,7 @@ - PR2433: ppc64le does not support -Xshare:dump - PR2434: SystemTap support is no longer optional - PR2439: NSS PKCS11 regression - due to java.security automatic loading + - PR2443: install stage fails where BUILD_ARCH_DIR != INSTALL_ARCH_DIR - Don't substitute 'j' for '-j' inside -I directives - Extend 8041658 to all files in the HotSpot build. - Remove jcheck