/hg/release/icedtea7-2.5: PR2395: Path to jvm.cfg is wrong in ad...

[andrew at icedtea.classpath.org]

changeset eb54def091bd in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=eb54def091bd
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 07 16:43:31 2015 +0100

	PR2395: Path to jvm.cfg is wrong in add-systemtap-boot

	2015-06-03  Andrew John Hughes  <gnu.andrew at 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.


diffstat:

 ChangeLog   |  12 ++++++++++++
 Makefile.am |   9 +++++----
 NEWS        |   1 +
 3 files changed, 18 insertions(+), 4 deletions(-)

diffs (80 lines):

diff -r d4df8b91c361 -r eb54def091bd ChangeLog
--- a/ChangeLog	Tue Jul 07 00:14:45 2015 +0100
+++ b/ChangeLog	Tue Jul 07 16:43:31 2015 +0100
@@ -24,6 +24,18 @@
 
 2015-06-03  Andrew John Hughes  <gnu.andrew at 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 at member.fsf.org>
+
 	* NEWS: Updated.
 
 2015-05-01  Tiago Sturmer Daitx  <tdaitx at linux.vnet.ibm.com>
diff -r d4df8b91c361 -r eb54def091bd Makefile.am
--- a/Makefile.am	Tue Jul 07 00:14:45 2015 +0100
+++ b/Makefile.am	Tue Jul 07 16:43:31 2015 +0100
@@ -55,6 +55,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
@@ -1808,7 +1809,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 \
@@ -1915,7 +1916,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 \
@@ -1961,7 +1962,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 \
@@ -2029,7 +2030,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 \
diff -r d4df8b91c361 -r eb54def091bd NEWS
--- a/NEWS	Tue Jul 07 00:14:45 2015 +0100
+++ b/NEWS	Tue Jul 07 16:43:31 2015 +0100
@@ -28,6 +28,7 @@
 * Bug fixes
   - PR2328: GCJ uses ppc64el named libarch directory on ppc64le
   - PR2341: Update README & INSTALL files
+  - PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
 * PPC & AIX port
   - S8069590: AIX port of "8050807: Better performing performance data handling"
   - S8078482, PR2307: ppc: pass thread to throw_AbstractMethodError