/hg/icedtea7: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jun 3 03:36:42 UTC 2015
changeset 17bad9cf419f in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=17bad9cf419f
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 03 04:08:44 2015 +0100
PR2394: ppc64le does not support -Xshare:dump
2015-06-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2394: ppc64le does not support -Xshare:dump
* Makefile.am:
(add-archive): Exclude ppc64le as well as ppc64.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
* NEWS: Updated.
changeset 31436744587b in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=31436744587b
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 03 04:22:39 2015 +0100
PR2328: GCJ uses ppc64el named libarch directory on ppc64le
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>
PR2328: GCJ uses ppc64el named libarch directory on ppc64le
* Makefile.am:
(bootstrap-directory-stage1): Handle boot JDK having
a ppc64el directory by symlinking to ppc64le.
changeset d20e49a7dbc8 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=d20e49a7dbc8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Jun 03 04:36:27 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 | 32 ++++++++++++++++++++++++++++++++
Makefile.am | 20 ++++++++++++--------
NEWS | 3 +++
3 files changed, 47 insertions(+), 8 deletions(-)
diffs (141 lines):
diff -r 033e62e28bfb -r d20e49a7dbc8 ChangeLog
--- a/ChangeLog Fri Apr 24 20:39:36 2015 +0100
+++ b/ChangeLog Wed Jun 03 04:36:27 2015 +0100
@@ -1,3 +1,35 @@
+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>
+
+ PR2328: GCJ uses ppc64el named libarch directory on ppc64le
+ * Makefile.am:
+ (bootstrap-directory-stage1): Handle boot JDK having
+ a ppc64el directory by symlinking to ppc64le.
+
+2015-06-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2394: ppc64le does not support -Xshare:dump
+ * Makefile.am:
+ (add-archive): Exclude ppc64le as well as ppc64.
+ (add-archive-debug): Likewise.
+ (add-archive-boot): Likewise.
+ * NEWS: Updated.
+
2015-04-24 Andrew John Hughes <gnu.andrew at member.fsf.org>
Update build following PR2233 & PR2236.
diff -r 033e62e28bfb -r d20e49a7dbc8 Makefile.am
--- a/Makefile.am Fri Apr 24 20:39:36 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
@@ -1624,10 +1625,13 @@
else \
ln -sfv $(STAGE1_BOOT_RUNTIME) $(STAGE1_BOOT_DIR)/lib/tools.jar ; \
fi
-# Workaround some older ppc64le builds installing to 'ppc64' rather than 'ppc64le'
+# Workaround some older ppc64le builds installing to 'ppc64' or 'ppc64el' rather than 'ppc64le'
if test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64 ; then \
ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64 \
$(STAGE1_BOOT_DIR)/jre/lib/$(JRE_ARCH_DIR) ; \
+ elif test -d $(SYSTEM_JDK_DIR)/jre/lib/ppc64el ; then \
+ ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/ppc64el \
+ $(STAGE1_BOOT_DIR)/jre/lib/$(JRE_ARCH_DIR) ; \
else \
ln -sfv $(SYSTEM_JDK_DIR)/jre/lib/$(JRE_ARCH_DIR) \
$(STAGE1_BOOT_DIR)/jre/lib/ ; \
@@ -1796,7 +1800,7 @@
if !ENABLE_CACAO
if !ZERO_BUILD
if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
- if test "x$(INSTALL_ARCH_DIR)" != "xppc64"; then \
+ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
$(BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
fi ; \
fi
@@ -1806,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 \
@@ -1903,7 +1907,7 @@
if !ENABLE_CACAO
if !ZERO_BUILD
if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
- if test "x$(INSTALL_ARCH_DIR)" != "xppc64"; then \
+ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
$(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
fi ; \
fi
@@ -1913,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 \
@@ -1959,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 \
@@ -2017,7 +2021,7 @@
if !ENABLE_CACAO
if !ZERO_BUILD
if [ -e $(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java ] ; then \
- if test "x$(INSTALL_ARCH_DIR)" != "xppc64"; then \
+ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
$(BOOT_BUILD_OUTPUT_DIR)/j2sdk-image/bin/java -Xshare:dump ; \
fi ; \
fi
@@ -2027,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 \
diff -r 033e62e28bfb -r d20e49a7dbc8 NEWS
--- a/NEWS Fri Apr 24 20:39:36 2015 +0100
+++ b/NEWS Wed Jun 03 04:36:27 2015 +0100
@@ -276,6 +276,9 @@
- PR2144: make dist fails due to lack of HotSpot-specific patches
- PR2233, RH1190835: Discover gsettings symbols separately so early versions of GLib can be used (e.g. on RHEL 6)
- 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):
More information about the distro-pkg-dev
mailing list