/hg/release/icedtea7-2.5: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Jul 14 15:47:35 UTC 2015
changeset a3302a9d4386 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=a3302a9d4386
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 07 16:56:52 2015 +0100
Set version to 2.5.6pre01.
2015-07-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
* configure.ac: Set version to 2.5.6pre01.
changeset f3e2e94ffb13 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=f3e2e94ffb13
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Mon Jul 13 23:58:47 2015 +0100
PR2367: 7 no longer builds with 6 - Util is not public in sun.management
2015-07-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2367: 7 no longer builds with 6 - Util is
not public in sun.management
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Pre-build
sun.management.Util if running on an
Oracle JDK with an inaccessible version.
(ICEDTEA_BOOT_PATCHES): Add -Xprefer:source
patch.
* NEWS: Updated.
* configure.ac:
Check for sun.management.Util class.
* patches/boot/prefer_source.patch:
Add -Xprefer:source option to javac invocations
for sun.security.other, java.util.jar,
sun.security.pkcs11, com.sun.crypto.provider and
sun.nio.cs so that newer interfaces in OpenJDK 7
are picked up instead of outdated boot JDK ones.
changeset 9e113aaecdb2 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=9e113aaecdb2
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Jul 14 16:46:57 2015 +0100
Added tag icedtea-2.5.6pre01 for changeset f3e2e94ffb13
diffstat:
.hgtags | 1 +
ChangeLog | 24 ++++++++++++++++++
Makefile.am | 12 ++++++++-
NEWS | 1 +
configure.ac | 6 +++-
patches/boot/prefer_source.patch | 51 ++++++++++++++++++++++++++++++++++++++++
6 files changed, 93 insertions(+), 2 deletions(-)
diffs (154 lines):
diff -r eb54def091bd -r 9e113aaecdb2 .hgtags
--- a/.hgtags Tue Jul 07 16:43:31 2015 +0100
+++ b/.hgtags Tue Jul 14 16:46:57 2015 +0100
@@ -47,3 +47,4 @@
5078409f15b9bfdc22f639d42b83210f5b72e030 icedtea-2.5.5pre01
dd18b2f67c8d00099bb843d17f25f079a8a27a38 icedtea-2.5.5pre02
6c555fd5b700215f2959610ea430679c5e09a416 icedtea-2.5.5
+f3e2e94ffb13c8be6472f40096d821779b3a2d97 icedtea-2.5.6pre01
diff -r eb54def091bd -r 9e113aaecdb2 ChangeLog
--- a/ChangeLog Tue Jul 07 16:43:31 2015 +0100
+++ b/ChangeLog Tue Jul 14 16:46:57 2015 +0100
@@ -1,3 +1,27 @@
+2015-07-13 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR2367: 7 no longer builds with 6 - Util is
+ not public in sun.management
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Pre-build
+ sun.management.Util if running on an
+ Oracle JDK with an inaccessible version.
+ (ICEDTEA_BOOT_PATCHES): Add -Xprefer:source
+ patch.
+ * NEWS: Updated.
+ * configure.ac:
+ Check for sun.management.Util class.
+ * patches/boot/prefer_source.patch:
+ Add -Xprefer:source option to javac invocations
+ for sun.security.other, java.util.jar,
+ sun.security.pkcs11, com.sun.crypto.provider and
+ sun.nio.cs so that newer interfaces in OpenJDK 7
+ are picked up instead of outdated boot JDK ones.
+
+2015-07-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * configure.ac: Set version to 2.5.6pre01.
+
2015-07-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* INSTALL: Update list of detected
diff -r eb54def091bd -r 9e113aaecdb2 Makefile.am
--- a/Makefile.am Tue Jul 07 16:43:31 2015 +0100
+++ b/Makefile.am Tue Jul 14 16:46:57 2015 +0100
@@ -120,6 +120,15 @@
$(SHARE)/javax/rmi/ssl/SslRMIServerSocketFactory.java
endif
+#IT2367 - Util is not public in sun.management; cannot be accessed from outside package
+if LACKS_SUN_MANAGEMENT_UTIL
+# Presence of com.sun.mirror API indicates an Oracle JDK with a private sun.management.Util
+if !LACKS_COM_SUN_MIRROR_TYPE_TYPEMIRROR
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/sun/management/Util.java
+endif
+endif
+
# Settings for javac
if NO_BYTECODE7
@@ -319,7 +328,8 @@
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch \
patches/boot/xsltproc.patch \
- patches/boot/ecj-odd.patch
+ patches/boot/ecj-odd.patch \
+ patches/boot/prefer_source.patch
if !DISABLE_BOOTSTRAP_TOOLS
ICEDTEA_BOOT_PATCHES += \
diff -r eb54def091bd -r 9e113aaecdb2 NEWS
--- a/NEWS Tue Jul 07 16:43:31 2015 +0100
+++ b/NEWS Tue Jul 14 16:46:57 2015 +0100
@@ -28,6 +28,7 @@
* Bug fixes
- PR2328: GCJ uses ppc64el named libarch directory on ppc64le
- PR2341: Update README & INSTALL files
+ - PR2367: 7 no longer builds with 6 - Util is not public in sun.management
- PR2395: Path to jvm.cfg is wrong in add-systemtap-boot
* PPC & AIX port
- S8069590: AIX port of "8050807: Better performing performance data handling"
diff -r eb54def091bd -r 9e113aaecdb2 configure.ac
--- a/configure.ac Tue Jul 07 16:43:31 2015 +0100
+++ b/configure.ac Tue Jul 14 16:46:57 2015 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.6pre00], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5.6pre01], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
@@ -148,6 +148,10 @@
dnl Check whether the HTTP server API is present in the bootstrap JDK, required by JAXWS
IT_CHECK_FOR_CLASS([COM_SUN_NET_HTTPSERVER_HEADERS], [com.sun.net.httpserver.Headers])
+dnl Check whether sun.management.Util is present in the bootstrap JDK, as the in-tree
+dnl version must be used
+IT_CHECK_FOR_CLASS([SUN_MANAGEMENT_UTIL], [sun.management.Util])
+
dnl Check whether the JDK can parse the dates used in the currency file
IT_PR64174_CHECK
diff -r eb54def091bd -r 9e113aaecdb2 patches/boot/prefer_source.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/prefer_source.patch Tue Jul 14 16:46:57 2015 +0100
@@ -0,0 +1,51 @@
+--- openjdk-boot.orig/jdk/make/java/jar/Makefile 2015-04-10 15:45:22.924158352 +0100
++++ openjdk-boot/jdk/make/java/jar/Makefile 2015-07-13 21:00:08.802942914 +0100
+@@ -26,6 +26,7 @@
+ BUILDDIR = ../..
+ PACKAGE = java.util.jar
+ PRODUCT = sun
++OTHER_JAVACFLAGS += -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+
+ #
+--- openjdk-boot.orig/jdk/make/sun/security/other/Makefile 2015-04-10 15:45:23.332162376 +0100
++++ openjdk-boot/jdk/make/sun/security/other/Makefile 2015-07-13 21:43:46.637311660 +0100
+@@ -26,6 +26,7 @@
+ BUILDDIR = ../../..
+ PACKAGE = sun.security.other
+ PRODUCT = sun
++OTHER_JAVACFLAGS += -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+
+ #
+--- openjdk-boot.orig/jdk/make/sun/security/pkcs11/Makefile 2015-04-10 15:45:23.332162376 +0100
++++ openjdk-boot/jdk/make/sun/security/pkcs11/Makefile 2015-07-13 22:10:21.433512900 +0100
+@@ -92,6 +92,7 @@
+ PACKAGE = sun.security.pkcs11
+ LIBRARY = j2pkcs11
+ PRODUCT = sun
++OTHER_JAVACFLAGS += -Xprefer:source
+
+ #
+ # The following is for when we need to do postprocessing
+--- openjdk-boot.orig/jdk/make/com/sun/crypto/provider/Makefile 2015-04-10 15:45:22.740156537 +0100
++++ openjdk-boot/jdk/make/com/sun/crypto/provider/Makefile 2015-07-13 22:28:28.630562057 +0100
+@@ -95,6 +95,7 @@
+ BUILDDIR = ../../../..
+ PACKAGE = com.sun.crypto.provider
+ PRODUCT = sun
++OTHER_JAVACFLAGS += -Xprefer:source
+
+ #
+ # The following is for when we need to do postprocessing
+--- openjdk-boot.orig/jdk/make/sun/nio/cs/Makefile 2015-04-10 15:45:23.320162258 +0100
++++ openjdk-boot/jdk/make/sun/nio/cs/Makefile 2015-07-13 22:12:44.291022762 +0100
+@@ -36,7 +36,7 @@
+ # This re-directs all the class files to a separate location
+ CLASSDESTDIR = $(TEMPDIR)/classes
+
+-OTHER_JAVACFLAGS += -Xlint:serial,-deprecation
++OTHER_JAVACFLAGS += -Xlint:serial,-deprecation -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+
+ #
More information about the distro-pkg-dev
mailing list