Mercurial > hg > icedtea7
changeset 2791:d20e49a7dbc8 icedtea-2.6.0pre20
PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
2015-06-03 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
* Makefile.am:
(BUILD_BOOT_JRE_ARCH_DIR): Added.
(clean-add-archive): Use BUILD_JRE_ARCH_DIR.
(clean-add-archive-debug): Use BUILD_DEBUG_JRE_ARCH_DIR.
(add-systemtap-boot): Use BUILD_BOOT_JRE_ARCH_DIR
instead of BUILD_JRE_ARCH_DIR which doesn't yet exist.
(clean-add-archive-boot): Use BUILD_BOOT_JRE_ARCH_DIR.
* NEWS: Updated.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Wed, 03 Jun 2015 04:36:27 +0100 |
| parents | 31436744587b |
| children | 5233c9daad19 |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 03 04:22:39 2015 +0100 +++ b/ChangeLog Wed Jun 03 04:36:27 2015 +0100 @@ -1,3 +1,15 @@ +2015-06-03 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR2395: Path to jvm.cfg is wrong in add-systemtap-boot + * Makefile.am: + (BUILD_BOOT_JRE_ARCH_DIR): Added. + (clean-add-archive): Use BUILD_JRE_ARCH_DIR. + (clean-add-archive-debug): Use BUILD_DEBUG_JRE_ARCH_DIR. + (add-systemtap-boot): Use BUILD_BOOT_JRE_ARCH_DIR + instead of BUILD_JRE_ARCH_DIR which doesn't yet exist. + (clean-add-archive-boot): Use BUILD_BOOT_JRE_ARCH_DIR. + * NEWS: Updated. + 2015-06-03 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Updated.
--- a/Makefile.am Wed Jun 03 04:22:39 2015 +0100 +++ b/Makefile.am Wed Jun 03 04:36:27 2015 +0100 @@ -54,6 +54,7 @@ SERVER_DIR = hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server BUILD_JRE_ARCH_DIR = $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) BUILD_DEBUG_JRE_ARCH_DIR = $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) +BUILD_BOOT_JRE_ARCH_DIR = $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR) REWRITER_BUILD_DIR = $(abs_top_builddir)/rewriter.build STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea @@ -1809,7 +1810,7 @@ touch stamps/add-archive.stamp clean-add-archive: - rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -vf $(BUILD_JRE_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive.stamp stamps/icedtea-debug.stamp: stamps/bootstrap-directory-symlink-stage2.stamp \ @@ -1916,7 +1917,7 @@ touch stamps/add-archive-debug.stamp clean-add-archive-debug: - rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -vf $(BUILD_DEBUG_JRE_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive-debug.stamp stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \ @@ -1962,7 +1963,7 @@ stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp if ENABLE_SYSTEMTAP mkdir -p $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/tapset ; \ - grep "client IGNORE" $(BUILD_JRE_ARCH_DIR)/jvm.cfg; \ + grep "client IGNORE" $(BUILD_BOOT_JRE_ARCH_DIR)/jvm.cfg; \ if test $$? -eq 0; then \ $(SED) -e '/\/client\/libjvm.so/d' \ < $(abs_top_builddir)/tapset/hotspot.stp \ @@ -2030,7 +2031,7 @@ touch $@ clean-add-archive-boot: - rm -vf $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -vf $(BUILD_BOOT_JRE_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive-boot.stamp stamps/icedtea-stage1.stamp: stamps/icedtea-boot.stamp \
--- a/NEWS Wed Jun 03 04:22:39 2015 +0100 +++ b/NEWS Wed Jun 03 04:36:27 2015 +0100 @@ -278,6 +278,7 @@ - PR2236: ppc64le should report its os.arch as ppc64le so tools can detect it - PR2328: GCJ uses ppc64el named libarch directory on ppc64le - PR2394: ppc64le does not support -Xshare:dump + - PR2395: Path to jvm.cfg is wrong in add-systemtap-boot New in release 2.5.5 (2015-04-14):