Mercurial > hg > icedtea7
changeset 2830:d4a9d80cb9aa
PR2539: Libraries in some subdirectories of jre/lib/{arch} are not installed
2015-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
PR2539: Libraries in some subdirectories of
jre/lib/{arch} are not installed
* Makefile.am:
(install-exec-local): Loop over jre/lib/$(INSTALL_ARCH_DIR)
and all subdirectories to ensure all libraries are
installed.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Thu, 16 Jul 2015 20:15:05 +0100 |
| parents | e6ffd4b963d6 |
| children | cff3873b35b5 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 26 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jul 16 19:25:59 2015 +0100 +++ b/ChangeLog Thu Jul 16 20:15:05 2015 +0100 @@ -1,3 +1,13 @@ +2015-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + PR2539: Libraries in some subdirectories of + jre/lib/{arch} are not installed + * Makefile.am: + (install-exec-local): Loop over jre/lib/$(INSTALL_ARCH_DIR) + and all subdirectories to ensure all libraries are + installed. + * NEWS: Updated. + 2015-07-16 Andrew John Hughes <gnu_andrew@member.fsf.org> PR2537: Desktop files do not allow installation from
--- a/Makefile.am Thu Jul 16 19:25:59 2015 +0100 +++ b/Makefile.am Thu Jul 16 20:15:05 2015 +0100 @@ -2866,8 +2866,7 @@ ${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/$(INSTALL_ARCH_DIR) - ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli + ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt} ${mkinstalldirs} $(DESTDIR)${prefix}/jre/lib/ext ${mkinstalldirs} $(DESTDIR)${prefix}/tapset if SPLIT_DEBUGINFO @@ -2875,8 +2874,7 @@ ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR) ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${exec_prefix}/lib/$(INSTALL_ARCH_DIR)/jli ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/bin $(DESTDIR)${prefix}/jre/lib - ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR) - ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli + ${mkinstalldirs} $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/{.,headless,jli,xawt} endif for files in $(BUILD_SDK_DIR)/bin/*; do \ name=$$(basename $${files}) ; \ @@ -2935,25 +2933,19 @@ else \ $(INSTALL_PROGRAM) $(BUILD_SDK_DIR)/jre/lib/jexec $(DESTDIR)${exec_prefix}/jre/lib ; \ fi - for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*.so; do \ - if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files}; then \ - name=$$(basename $${files}) ; \ - dir=$$(echo $$(dirname $${files}) | $(SED) "s#$(BUILD_SDK_DIR)#$(BUILD_DEBUGINFO_DIR)#") ; \ - $(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${name}; \ - $(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR); \ - else \ - $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR); \ - fi ; \ - done - for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/jli/*.so; do \ - if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files} ; then \ - name=$$(basename $${files}) ; \ - dir=$$(echo $$(dirname $${files}) | $(SED) "s#$(BUILD_SDK_DIR)#$(BUILD_DEBUGINFO_DIR)#") ; \ - $(INSTALL_PROGRAM) $${dir}/$${name}.stripped $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli/$${name}; \ - $(INSTALL_PROGRAM) $${dir}/$${name}.debug $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli; \ - else \ - $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/jli; \ - fi ; \ + for subdirs in . headless jli xawt ; do \ + for files in $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}/*.so; do \ + if test "x$(enable_split_debuginfo)" = "xyes" -a ! -h $${files}; then \ + name=$$(basename $${files}) ; \ + dir=$$(echo $$(dirname $${files}) | $(SED) "s#$(BUILD_SDK_DIR)#$(BUILD_DEBUGINFO_DIR)#") ; \ + $(INSTALL_PROGRAM) $${dir}/$${name}.stripped \ + $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}/$${name}; \ + $(INSTALL_PROGRAM) $${dir}/$${name}.debug \ + $(DESTDIR)$(DEBUG_PREFIX)/${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}; \ + else \ + $(INSTALL_PROGRAM) $${files} $(DESTDIR)${prefix}/jre/lib/$(INSTALL_ARCH_DIR)/$${subdirs}; \ + fi ; \ + done ; \ done for vms in client server ; do \ if [ -d $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/$${vms} ] ; then \
--- a/NEWS Thu Jul 16 19:25:59 2015 +0100 +++ b/NEWS Thu Jul 16 20:15:05 2015 +0100 @@ -335,6 +335,7 @@ - PR2534: Install TRADEMARK, COPYING and ChangeLog as RPM spec file does - PR2535: install-data-local needs to check that classes.jsa actually exists - PR2537: Desktop files do not allow installation from multiple versions of IcedTea + - PR2539: Libraries in some subdirectories of jre/lib/{arch} are not installed * AArch64 port - Add copyright to aarch64_ad.m4 - S8069593: Changes to JavaThread::_thread_state must use acquire and release