[PATCH REVIEW] IcedTea7 2.0 Backports
Dr Andrew John Hughes
ahughes at redhat.com
Fri Sep 30 08:46:46 PDT 2011
A couple of issues have come up with building IcedTea7 using itself (full
bootstrap) and not requiring a new enough version of Glib for --enable-system-gio.
The fixes are:
For building with IcedTea7:
http://icedtea.classpath.org/hg/icedtea7/rev/f75092cac189
Only build bootstrap classes with source/target 1.6 if the VM doesn't support 1.7 bytecode.
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(ICEDTEA_BOOT_PATCHES): Only apply
use_target_6_for_bootstrap_classes if 1.7
bytecode is not supported by the VM. Fixes
bootstrap with IcedTea7.
* acinclude.m4:
(IT_BYTECODE7_CHECK): Check if the VM supports
1.7 bytecode.
* configure.ac: Call IT_BYTECODE7_CHECK.
http://icedtea.classpath.org/hg/icedtea7/rev/15866ac3f41b
Turn off forced -Werror when building com.sun.java.pack
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
Bump changesets to bring in fix which
turns off forced -Werror.
* Makefile.am:
(CORBA_CHANGESET): Updated.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
This also requires bringing http://icedtea.classpath.org/hg/icedtea7-forest/jdk/rev/d9fca71ba183
into the 2.0 forest:
--- a/make/com/sun/java/pack/Makefile Wed Sep 28 23:13:29 2011 +0100
+++ b/make/com/sun/java/pack/Makefile Fri Sep 30 05:30:03 2011 +0100
@@ -33,7 +33,6 @@
PRODUCT = sun
PGRM = unpack200
JAVAC_MAX_WARNINGS=true
-JAVAC_WARNINGS_FATAL=true
include $(BUILDDIR)/common/Defs.gmk
CPLUSPLUSLIBRARY=true
And finally the issue caught by Pavel and Mark today, requiring GIO/Glib 2.26 for GSettings:
http://icedtea.classpath.org/hg/icedtea7/rev/fbad82bc6985
Check for GIO >= 2.26 for GSettings.
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_CHECK_FOR_GIO): Require 2.26 and
above for GSettings.
Are these ok for 2.0?
Patches attached.
Thanks,
--
Andrew :)
Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)
Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: F5862A37 (https://keys.indymedia.org/)
Fingerprint = EA30 D855 D50F 90CD F54D 0698 0713 C3ED F586 2A37
-------------- next part --------------
# HG changeset patch
# User Andrew John Hughes <ahughes at redhat.com>
# Date 1317352052 -3600
# Node ID f75092cac18973ae8c71794bcdd8d0fd71804f4c
# Parent 05ed8db6b216d399953dd051f4ff3a9c017ae9f0
Only build bootstrap classes with source/target 1.6 if the VM doesn't support 1.7 bytecode.
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
(ICEDTEA_BOOT_PATCHES): Only apply
use_target_6_for_bootstrap_classes if 1.7
bytecode is not supported by the VM. Fixes
bootstrap with IcedTea7.
* acinclude.m4:
(IT_BYTECODE7_CHECK): Check if the VM supports
1.7 bytecode.
* configure.ac: Call IT_BYTECODE7_CHECK.
diff -r 05ed8db6b216 -r f75092cac189 ChangeLog
--- a/ChangeLog Wed Sep 28 23:07:52 2011 +0100
+++ b/ChangeLog Fri Sep 30 04:07:32 2011 +0100
@@ -1,3 +1,15 @@
+2011-09-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_BOOT_PATCHES): Only apply
+ use_target_6_for_bootstrap_classes if 1.7
+ bytecode is not supported by the VM. Fixes
+ bootstrap with IcedTea7.
+ * acinclude.m4:
+ (IT_BYTECODE7_CHECK): Check if the VM supports
+ 1.7 bytecode.
+ * configure.ac: Call IT_BYTECODE7_CHECK.
+
2011-09-27 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 05ed8db6b216 -r f75092cac189 Makefile.am
--- a/Makefile.am Wed Sep 28 23:07:52 2011 +0100
+++ b/Makefile.am Fri Sep 30 04:07:32 2011 +0100
@@ -318,8 +318,7 @@
patches/boot/ecj-multicatch.patch \
patches/boot/ecj-trywithresources.patch \
patches/boot/ecj-autoboxing.patch \
- patches/boot/xsltproc.patch \
- patches/boot/use_target_6_for_bootstrap_classes.patch
+ patches/boot/xsltproc.patch
if CP39408_JAVAH
ICEDTEA_BOOT_PATCHES += patches/boot/pr39408.patch
@@ -364,6 +363,10 @@
ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
endif
+if NO_BYTECODE7
+ICEDTEA_BOOT_PATCHES += patches/boot/use_target_6_for_bootstrap_classes.patch
+endif
+
ICEDTEA_BOOT_PATCHES += $(DISTRIBUTION_BOOT_PATCHES)
# OpenJDK build environment.
diff -r 05ed8db6b216 -r f75092cac189 acinclude.m4
--- a/acinclude.m4 Wed Sep 28 23:07:52 2011 +0100
+++ b/acinclude.m4 Fri Sep 30 04:07:32 2011 +0100
@@ -2146,3 +2146,35 @@
AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP})
AC_SUBST(ALT_JAMVM_SRC_ZIP)
])
+
+AC_DEFUN([IT_BYTECODE7_CHECK],[
+AC_CACHE_CHECK([if the VM lacks support for 1.7 bytecode], it_cv_bytecode7, [
+CLASS=Test.java
+BYTECODE=$(echo $CLASS|sed 's#\.java##')
+mkdir tmp.$$
+cd tmp.$$
+cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+public class Test
+{
+ public static void main(String[] args)
+ {
+ }
+}]
+EOF
+if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1 ; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1 ; then
+ it_cv_bytecode7=no;
+ else
+ it_cv_bytecode7=yes;
+ fi
+else
+ it_cv_bytecode7=yes;
+fi
+])
+rm -f $CLASS *.class
+cd ..
+rmdir tmp.$$
+AM_CONDITIONAL([NO_BYTECODE7], test x"${it_cv_bytecode7}" = "xyes")
+AC_PROVIDE([$0])dnl
+])
diff -r 05ed8db6b216 -r f75092cac189 configure.ac
--- a/configure.ac Wed Sep 28 23:07:52 2011 +0100
+++ b/configure.ac Fri Sep 30 04:07:32 2011 +0100
@@ -118,6 +118,7 @@
IT_CHECK_FOR_CLASS([SUN_AWT_TOOLKIT], [sun.awt.SunToolkit])
IT_CHECK_ENABLE_WARNINGS
IT_DIAMOND_CHECK
+IT_BYTECODE7_CHECK
IT_FIND_RHINO_JAR
IT_WITH_OPENJDK_SRC_ZIP
-------------- next part --------------
# HG changeset patch
# User Andrew John Hughes <ahughes at redhat.com>
# Date 1317357774 -3600
# Node ID 15866ac3f41bc8528c19a4c14190cbca9fbef1d3
# Parent 875cada723d75edfc9b26973ac71a7317d39ee49
Turn off forced -Werror when building com.sun.java.pack
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
Bump changesets to bring in fix which
turns off forced -Werror.
* Makefile.am:
(CORBA_CHANGESET): Updated.
(HOTSPOT_CHANGESET): Likewise.
(JAXP_CHANGESET): Likewise.
(JAXWS_CHANGESET): Likewise.
(JDK_CHANGESET): Likewise.
(LANGTOOLS_CHANGESET): Likewise.
(OPENJDK_CHANGESET): Likewise.
(CORBA_SHA256SUM): Likewise.
(HOTSPOT_SHA256SUM): Likewise.
(JAXP_SHA256SUM): Likewise.
(JAXWS_SHA256SUM): Likewise.
(JDK_SHA256SUM): Likewise.
(LANGTOOLS_SHA256SUM): Likewise.
(OPENJDK_SHA256SUM): Likewise.
diff -r 875cada723d7 -r 15866ac3f41b ChangeLog
--- a/ChangeLog Fri Sep 30 04:33:46 2011 +0100
+++ b/ChangeLog Fri Sep 30 05:42:54 2011 +0100
@@ -1,3 +1,23 @@
+2011-09-30 Andrew John Hughes <ahughes at redhat.com>
+
+ Bump changesets to bring in fix which
+ turns off forced -Werror.
+ * Makefile.am:
+ (CORBA_CHANGESET): Updated.
+ (HOTSPOT_CHANGESET): Likewise.
+ (JAXP_CHANGESET): Likewise.
+ (JAXWS_CHANGESET): Likewise.
+ (JDK_CHANGESET): Likewise.
+ (LANGTOOLS_CHANGESET): Likewise.
+ (OPENJDK_CHANGESET): Likewise.
+ (CORBA_SHA256SUM): Likewise.
+ (HOTSPOT_SHA256SUM): Likewise.
+ (JAXP_SHA256SUM): Likewise.
+ (JAXWS_SHA256SUM): Likewise.
+ (JDK_SHA256SUM): Likewise.
+ (LANGTOOLS_SHA256SUM): Likewise.
+ (OPENJDK_SHA256SUM): Likewise.
+
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am:
diff -r 875cada723d7 -r 15866ac3f41b Makefile.am
--- a/Makefile.am Fri Sep 30 04:33:46 2011 +0100
+++ b/Makefile.am Fri Sep 30 05:42:54 2011 +0100
@@ -2,21 +2,21 @@
OPENJDK_VERSION = b147
-CORBA_CHANGESET = d034cc90ecc2
-HOTSPOT_CHANGESET = 7693eb0fce1f
-JAXP_CHANGESET = b8d01501956a
-JAXWS_CHANGESET = e6cd09c7ef22
-JDK_CHANGESET = 7ec1845521ed
-LANGTOOLS_CHANGESET = fb7fb3071b64
-OPENJDK_CHANGESET = 3defd24c2671
+CORBA_CHANGESET = 953de8c7bccb
+HOTSPOT_CHANGESET = b28ae681bae0
+JAXP_CHANGESET = 948e734135ea
+JAXWS_CHANGESET = 5d3734549424
+JDK_CHANGESET = d9fca71ba183
+LANGTOOLS_CHANGESET = 9b85f1265346
+OPENJDK_CHANGESET = 0a76e5390e68
-CORBA_SHA256SUM = 06e7778aa1670f064e2c9fef7bdedc66fc679262ab8ee7aee018329e1ec787a8
-HOTSPOT_SHA256SUM = 6b2c9b21918183a383ab380c57f70d4be6199df0e2127bb762a20b6eca39e3a2
-JAXP_SHA256SUM = 4e9c1a2f240cee406d56832e2e7be254a87b511ee781463a95da4f000c188181
-JAXWS_SHA256SUM = 3d13408b4a81111fd88fce043ca2c96c4d31da9aa812a8d608b56248ecac4aca
-JDK_SHA256SUM = 843e7ccd4c2bad5c96aaa983e34f1eb27510229f138115fa0951e05358c50b2b
-LANGTOOLS_SHA256SUM = 9ddc00ec50fd2f5e331dc2bc10da4e23b69bf644eb92d50b39a2003c18fb5aa1
-OPENJDK_SHA256SUM = 4043a75c2c4385dd735f8dbbf2369311ce1b951217c9dbe9bba9609e24eb291e
+CORBA_SHA256SUM = 303d862f722d34ede330e9afdb0f2c9d61e02134beb4d562957e9574a91f8cca
+HOTSPOT_SHA256SUM = dcb5a8d4a0a466e3673f891cea40ce163c02f26b0054dfc41c30e0f87c5c2f64
+JAXP_SHA256SUM = 66948dee25e0224b12587ba150b21dab2e21b260a853bd1272e07c8d08d2e586
+JAXWS_SHA256SUM = 6aace2cc9f1a98a3822733ad568cc070ec178ff3618c05229c68072af3ed4765
+JDK_SHA256SUM = d8e9bb264f2a31424764466273f10c05d4247328ab4c08a0f4b8123993d78e65
+LANGTOOLS_SHA256SUM = 03a256afc7371b3b0fbbbfd80a318e22984f6cbff26082948e8d5845ba193aee
+OPENJDK_SHA256SUM = aa3b3cf17081cde2a4014e5dffec75f5b5402ad48f7f9943c32a2fa4544a8746
CACAO_VERSION = 4549072ab2de
CACAO_SHA256SUM = ec097ce96f047abbaeab4faab752c121d29f08bdeae358038a0b7cde03361d07
-------------- next part --------------
# HG changeset patch
# User Andrew John Hughes <ahughes at redhat.com>
# Date 1317396733 -3600
# Node ID fbad82bc69858ec8230953d41bc86f4012e5ab7a
# Parent 15866ac3f41bc8528c19a4c14190cbca9fbef1d3
Check for GIO >= 2.26 for GSettings.
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4:
(IT_CHECK_FOR_GIO): Require 2.26 and
above for GSettings.
diff -r 15866ac3f41b -r fbad82bc6985 ChangeLog
--- a/ChangeLog Fri Sep 30 05:42:54 2011 +0100
+++ b/ChangeLog Fri Sep 30 16:32:13 2011 +0100
@@ -1,3 +1,9 @@
+2011-09-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_FOR_GIO): Require 2.26 and
+ above for GSettings.
+
2011-09-30 Andrew John Hughes <ahughes at redhat.com>
Bump changesets to bring in fix which
diff -r 15866ac3f41b -r fbad82bc6985 acinclude.m4
--- a/acinclude.m4 Fri Sep 30 05:42:54 2011 +0100
+++ b/acinclude.m4 Fri Sep 30 16:32:13 2011 +0100
@@ -2037,10 +2037,10 @@
AC_MSG_RESULT(${ENABLE_SYSTEM_GIO})
if test x"${ENABLE_SYSTEM_GIO}" = "xyes"; then
dnl Check for Gio+ headers and libraries.
- PKG_CHECK_MODULES(GIO, gio-2.0,[GIO_FOUND=yes],[GIO_FOUND=no])
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.26,[GIO_FOUND=yes],[GIO_FOUND=no])
if test "x${GIO_FOUND}" = xno
then
- AC_MSG_ERROR([Could not find GIO; install GIO or build with --disable-system-gio to use the in-tree headers.])
+ AC_MSG_ERROR([Could not find GIO >= 2.26; install GIO or build with --disable-system-gio to use the in-tree headers.])
fi
AC_SUBST(GIO_CFLAGS)
AC_SUBST(GIO_LIBS)
More information about the distro-pkg-dev
mailing list