Mercurial > hg > icedtea8
changeset 2791:80a6a5565c3e icedtea-3.6.0pre02
PR3486: Path to jvm.cfg is wrong in add-systemtap-boot
2015-06-03 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR3486: 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 | Mon, 30 Oct 2017 05:56:10 +0000 |
| parents | 04998624131e |
| children | 7d329a0b302a |
| files | ChangeLog Makefile.am NEWS |
| diffstat | 3 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Oct 30 05:48:50 2017 +0000 +++ b/ChangeLog Mon Oct 30 05:56:10 2017 +0000 @@ -1,3 +1,15 @@ +2015-06-03 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR3486: 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. + 2010-09-24 Andrew John Hughes <gnu.andrew@redhat.com> PR3485: Support additional targets for the bootstrap build
--- a/Makefile.am Mon Oct 30 05:48:50 2017 +0000 +++ b/Makefile.am Mon Oct 30 05:56:10 2017 +0000 @@ -70,6 +70,7 @@ BUILD_BOOT_SDK_DIR = $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image BUILD_BOOT_JRE_DIR = $(BUILD_BOOT_IMAGE_DIR)/j2re-image BUILD_BOOT_DEBUGINFO_DIR = $(BUILD_BOOT_IMAGE_DIR)/j2sdk-image.stripped +BUILD_BOOT_JRE_ARCH_DIR = $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR) STAGE1_BOOT_DIR = $(abs_top_builddir)/bootstrap/boot STAGE2_BOOT_DIR = $(abs_top_builddir)/bootstrap/icedtea JAMVM_IMPORT_PATH = $(abs_top_builddir)/jamvm/install/hotspot @@ -2043,7 +2044,7 @@ touch stamps/add-archive.stamp clean-add-archive: - rm -vf $(BUILD_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -vf $(BUILD_JRE_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive.stamp stamps/split-debuginfo.stamp: stamps/icedtea.stamp @@ -2183,7 +2184,7 @@ touch stamps/add-archive-debug.stamp clean-add-archive-debug: - rm -vf $(BUILD_DEBUG_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -vf $(BUILD_DEBUG_JRE_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive-debug.stamp stamps/split-debuginfo-debug.stamp: stamps/icedtea-debug.stamp @@ -2260,7 +2261,7 @@ stamps/add-systemtap-boot.stamp: stamps/icedtea-boot.stamp if ENABLE_SYSTEMTAP mkdir -p $(BUILD_BOOT_SDK_DIR)/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 \ @@ -2333,7 +2334,7 @@ touch $@ clean-add-archive-boot: - rm -vf $(BUILD_BOOT_SDK_DIR)/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa + rm -vf $(BUILD_BOOT_JRE_ARCH_DIR)/*/*.jsa rm -f stamps/add-archive-boot.stamp stamps/split-debuginfo-boot.stamp: stamps/icedtea-boot.stamp
--- a/NEWS Mon Oct 30 05:48:50 2017 +0000 +++ b/NEWS Mon Oct 30 05:56:10 2017 +0000 @@ -25,6 +25,7 @@ - S8187822, PR3478, RH1494230: C2 conditonal move optimization might create broken graph * Bug fixes - PR3479, RH1486025: ECC and NSS JVM crash + - PR3486: Path to jvm.cfg is wrong in add-systemtap-boot - S8165852, PR3468: (fs) Mount point not found for a file which is present in overlayfs - S8188030, PR3459, RH1484079: AWT java apps fail to start when some minimal fonts are present * PPC port