/hg/icedtea: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jun 16 23:07:22 UTC 2015
changeset 40028a1dbc12 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=40028a1dbc12
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jun 15 15:55:52 2015 +0100
PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be passed to OpenJDK build
2015-06-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be
passed to OpenJDK build
* Makefile.am:
(ICEDTEA_CONFIGURE): Pass --with-extra-cflags,
--with-extra-cxxflags and --with-extra-ldflags,
using CFLAGS, CXXFLAGS and LDFLAGS values
held by make.
* NEWS: Updated.
changeset e383106102c8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e383106102c8
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jun 15 16:31:23 2015 +0100
PR2413: OpenJDK doesn't auto-select Zero on architectures where no server JVM is available
2015-06-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2413: OpenJDK doesn't auto-select Zero on
architectures where no server JVM is available
* Makefile.am:
(ICEDTEA_ZERO_BUILD): Removed.
(ICEDTEA_SHARK_BUILD): Likewise.
(ICEDTEA_CONFIGURE): Pass zero
or zeroshark as appropriate to
--with-jvm-variants in OpenJDK configure.
* NEWS: Updated.
changeset aecf66878c91 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=aecf66878c91
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jun 16 20:04:36 2015 +0100
PR2429: OpenJDK build does not copy a symlinked cacerts file
2015-06-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
PR2429: OpenJDK build does not copy a symlinked
cacerts file
* Makefile.am:
(JDK_CACERTS_FILE): Added to specify the location
of cacerts within the bootstrap JDK.
(CACERTS_FILE): Find the regular cacerts file,
dereferencing any symlinks which point to it.
(ICEDTEA_CONFIGURE): Pass the deferenced CACERTS_FILE
to OpenJDK's configure, rather than the JDK path.
* NEWS: Updated.
* configure.ac:
Call IT_FIND_TOOL to locate the readlink tool,
which is part of coreutils.
changeset 703212f89ecb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=703212f89ecb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jun 16 22:02:51 2015 +0100
PR2432: ppc64 JIT doesn't support class data sharing
2014-05-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2432: ppc64 JIT doesn't support class data sharing
* Makefile.am:
(add-archive): Skip on ppc64.
(add-archive-debug): Likewise.
(add-archive-boot): Likewise.
* NEWS: Updated.
changeset 8e7d421dd92e in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=8e7d421dd92e
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jun 16 22:18:59 2015 +0100
PR2433: ppc64le does not support -Xshare:dump
2015-06-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2433: 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.
diffstat:
ChangeLog | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 43 +++++++++++++++++++++++++++++--------------
NEWS | 5 +++++
configure.ac | 1 +
4 files changed, 92 insertions(+), 14 deletions(-)
diffs (194 lines):
diff -r eef478c09a51 -r 8e7d421dd92e ChangeLog
--- a/ChangeLog Mon Jun 08 17:14:05 2015 +0100
+++ b/ChangeLog Tue Jun 16 22:18:59 2015 +0100
@@ -1,3 +1,60 @@
+2015-06-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2433: 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.
+
+2014-05-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2432: ppc64 JIT doesn't support class data sharing
+ * Makefile.am:
+ (add-archive): Skip on ppc64.
+ (add-archive-debug): Likewise.
+ (add-archive-boot): Likewise.
+ * NEWS: Updated.
+
+2015-06-16 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2429: OpenJDK build does not copy a symlinked
+ cacerts file
+ * Makefile.am:
+ (JDK_CACERTS_FILE): Added to specify the location
+ of cacerts within the bootstrap JDK.
+ (CACERTS_FILE): Find the regular cacerts file,
+ dereferencing any symlinks which point to it.
+ (ICEDTEA_CONFIGURE): Pass the deferenced CACERTS_FILE
+ to OpenJDK's configure, rather than the JDK path.
+ * NEWS: Updated.
+ * configure.ac:
+ Call IT_FIND_TOOL to locate the readlink tool,
+ which is part of coreutils.
+
+2015-06-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2413: OpenJDK doesn't auto-select Zero on
+ architectures where no server JVM is available
+ * Makefile.am:
+ (ICEDTEA_ZERO_BUILD): Removed.
+ (ICEDTEA_SHARK_BUILD): Likewise.
+ (ICEDTEA_CONFIGURE): Pass zero
+ or zeroshark as appropriate to
+ --with-jvm-variants in OpenJDK configure.
+ * NEWS: Updated.
+
+2015-06-15 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be
+ passed to OpenJDK build
+ * Makefile.am:
+ (ICEDTEA_CONFIGURE): Pass --with-extra-cflags,
+ --with-extra-cxxflags and --with-extra-ldflags,
+ using CFLAGS, CXXFLAGS and LDFLAGS values
+ held by make.
+ * NEWS: Updated.
+
2015-06-08 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
diff -r eef478c09a51 -r 8e7d421dd92e Makefile.am
--- a/Makefile.am Mon Jun 08 17:14:05 2015 +0100
+++ b/Makefile.am Tue Jun 16 22:18:59 2015 +0100
@@ -96,6 +96,11 @@
VERSION_SETTINGS_FILE = openjdk/jdk/make/ProfileNames.gmk
+JDK_CACERTS_FILE = $(SYSTEM_JDK_DIR)/jre/lib/security/cacerts
+
+CACERTS_FILE = \
+ `if [ -h $(JDK_CACERTS_FILE) ] ; then $(READLINK) -e $(JDK_CACERTS_FILE) ; else echo $(JDK_CACERTS_FILE); fi`
+
# Sources used from OpenJDK.
#PR43148 - javac fails due to missing java.util.regex.Matcher.quoteReplacement
#PR48033 - Missing javax.management.remote.JMXServiceURL
@@ -274,13 +279,6 @@
ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
# OpenJDK build environment.
-if ZERO_BUILD
- ICEDTEA_ZERO_BUILD = true
-endif
-if SHARK_BUILD
- ICEDTEA_SHARK_BUILD = true
-endif
-
ICEDTEA_NAME = IcedTea
if HAS_ICEDTEA_REVISION
ICEDTEA_REV = +${ICEDTEA_REVISION}
@@ -291,12 +289,15 @@
ICEDTEA_CONFIGURE = \
--enable-unlimited-crypto \
- --with-cacerts-file=$(SYSTEM_JDK_DIR)/jre/lib/security/cacerts \
+ --with-cacerts-file=$(CACERTS_FILE) \
--with-stdc++lib=dynamic \
--with-boot-jdk=$(BOOT_DIR) \
--with-update-version=$(JDK_UPDATE_VERSION) \
--with-build-number=$(BUILD_VERSION) \
- --with-milestone="fcs"
+ --with-milestone="fcs" \
+ --with-extra-cflags="$(CFLAGS)" \
+ --with-extra-cxxflags="$(CXXFLAGS)" \
+ --with-extra-ldflags="$(LDFLAGS)"
if ENABLE_CACAO
ICEDTEA_CONFIGURE += \
@@ -348,13 +349,21 @@
--with-giflib=bundled
endif
+if ZERO_BUILD
+ICEDTEA_CONFIGURE += \
+ --with-jvm-variants=zero
+endif
+
+if SHARK_BUILD
+ICEDTEA_CONFIGURE += \
+ --with-jvm-variants=zeroshark
+endif
+
ICEDTEA_ENV = \
LANG="C" \
PATH="$(BOOT_DIR)/bin:$(OS_PATH):$$PATH" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
- ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
- SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
ARCH_DATA_MODEL="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
@@ -1682,7 +1691,9 @@
if !ENABLE_CACAO
if !ZERO_BUILD
if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \
- $(BUILD_SDK_DIR)/bin/java -Xshare:dump ; \
+ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
+ $(BUILD_SDK_DIR)/bin/java -Xshare:dump ; \
+ fi ; \
fi
endif
endif
@@ -1708,7 +1719,9 @@
if !ENABLE_CACAO
if !ZERO_BUILD
if [ -e $(BUILD_DEBUG_SDK_DIR)/bin/java ] ; then \
- $(BUILD_DEBUG_SDK_DIR)/bin/java -Xshare:dump ; \
+ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
+ $(BUILD_DEBUG_SDK_DIR)/bin/java -Xshare:dump ; \
+ fi ; \
fi
endif
endif
@@ -1815,7 +1828,9 @@
if !ENABLE_CACAO
if !ZERO_BUILD
if [ -e $(BUILD_BOOT_SDK_DIR)/bin/java ] ; then \
- $(BUILD_BOOT_SDK_DIR)/bin/java -Xshare:dump ; \
+ if test "x$(INSTALL_ARCH_DIR)" != "xppc64" -a "x$(INSTALL_ARCH_DIR)" != "xppc64le" ; then \
+ $(BUILD_BOOT_SDK_DIR)/bin/java -Xshare:dump ; \
+ fi ; \
fi
endif
endif
diff -r eef478c09a51 -r 8e7d421dd92e NEWS
--- a/NEWS Mon Jun 08 17:14:05 2015 +0100
+++ b/NEWS Tue Jun 16 22:18:59 2015 +0100
@@ -101,6 +101,11 @@
- PR2409: Update Zero macro to match one in IcedTea 2.x
- PR2410: Support PPC64 JIT on ppc64le
- PR2411: Fix references to hotspot.map following PR2001
+ - PR2413: OpenJDK doesn't auto-select Zero on architectures where no server JVM is available
+ - PR2414: CFLAGS, CXXFLAGS and LDFLAGS should be passed to OpenJDK build
+ - PR2429: OpenJDK build does not copy a symlinked cacerts file
+ - PR2432: ppc64 JIT doesn't support class data sharing
+ - PR2433: ppc64le does not support -Xshare:dump
- Don't substitute 'j' for '-j' inside -I directives
- Extend 8041658 to all files in the HotSpot build.
- Remove jcheck
diff -r eef478c09a51 -r 8e7d421dd92e configure.ac
--- a/configure.ac Mon Jun 08 17:14:05 2015 +0100
+++ b/configure.ac Tue Jun 16 22:18:59 2015 +0100
@@ -34,6 +34,7 @@
IT_FIND_TOOL([UNZIP], [unzip])
IT_FIND_TOOL([CPIO], [cpio])
IT_FIND_TOOL([FILE], [file])
+IT_FIND_TOOL([READLINK], [readlink])
AC_CHECK_TOOLS([FASTJAR], [fastjar jar])
if test "x$FASTJAR" = x; then
AC_MSG_ERROR([Can't find fastjar or jar])
More information about the distro-pkg-dev
mailing list