/hg/icedtea6-hg: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri May 31 07:05:49 PDT 2013
changeset a371c1860804 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=a371c1860804
author: Pavel Tisnovsky <ptisnovs at redhat.com>
date: Mon May 20 13:25:41 2013 +0200
Fixed wrong JTreg test name in @run annotation.
changeset 632c42c569f8 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=632c42c569f8
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon May 27 11:00:32 2013 +0100
PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1458: Make use of bootstrap tools & -Xbootclasspath
patches optional
* INSTALL: Document --disable-bootstrap-tools.
* Makefile.am:
(ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException
if any of the constructors are missing.
(ICEDTEA_ECJ_PATCHES): Split out fphexconstants,
no-sun-classes, bootstrap-tools and xbootclasspath
patches from icedtea.patch. Make the latter two
conditional.
* NEWS: Updated.
* acinclude.m4:
(IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools
to decide whether to use the boot javac/javah or the
one built as part of langtools. Defaults to on.
(IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java
can be passed -Xbootclasspath/p to prepend a path
to the bootclasspath or not.
* configure.ac: Invoke the new macros and test
for the java.sql.SQLException constructors.
* javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
and -Xbootclasspath/a by prepending, setting or appending
its value to the bootclasspath option used to ecj,
respectively.
* patches/ecj/bootstrap-tools.patch:
Split from icedtea.patch. Uses the bootstrap
javac and javah rather than the langtools one for
CORBA and JDK.
* patches/ecj/corba-dependencies.patch:
Include the langtools source directory on the sourcepath.
* patches/ecj/fphexconstants.patch:
Split replacements of floating point hex constants out
from icedtea.patch.
* patches/ecj/icedtea.patch:
Remove split-out segements. Drop addition of ICEDTEA_RT
in BuildToolJar.gmk and common/Rules.gmk in JDK altogether,
along with setting of bootclasspath in langtools.
* patches/ecj/needs-6.patch:
Add java.awt Makefile.
* patches/ecj/no-sun-classes.patch:
Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the
bootclasspath in java.text, sun.text and sun.javazic
Makefiles for VMs without internal Sun classes.
* patches/ecj/xbootclasspath.patch:
Replaces the use of -Xbootclasspath in java.text,
sun.text and sun.javazic for those VMs that don't
support it (gcj).
changeset 776606a4878e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=776606a4878e
author: Andrew John Hughes <ahughes at redhat.com>
date: Mon May 27 12:48:12 2013 +0100
Merge
changeset aa0c5db9e503 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=aa0c5db9e503
author: Andrew John Hughes <ahughes at redhat.com>
date: Fri May 31 15:05:33 2013 +0100
Sync with upstream.
2013-05-31 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/copy_memory.patch,
* patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch:
Drop upstreamed patches.
* Makefile.am:
(DROP_PATCHES): Remove JAXP patch.
(ICEDTEA_PATCHES): Remove OpenJDK6-4 patch.
diffstat:
ChangeLog | 143 +
INSTALL | 13 +-
Makefile.am | 83 +-
NEWS | 1 +
acinclude.m4 | 61 +
configure.ac | 9 +
javac.in | 24 +-
patches/copy_memory.patch | 36 -
patches/ecj/bootstrap-tools.patch | 87 +
patches/ecj/corba-dependencies.patch | 14 +-
patches/ecj/fphexconstants.patch | 60 +
patches/ecj/icedtea.patch | 233 -
patches/ecj/needs-6.patch | 12 +
patches/ecj/no-sun-classes.patch | 35 +
patches/ecj/override.patch | 51 +
patches/ecj/xbootclasspath.patch | 45 +
patches/hotspot/original/7197906-handle_32_bit_shifts.patch | 33 -
patches/hotspot/original/fix_get_stack_bounds_leak.patch | 12 -
patches/jtreg-TextLayoutBoundsChecks.patch | 2 +-
patches/openjdk/8004302-soap_test_failure.patch | 75 -
patches/openjdk/8004341-jck_dialog_failure.patch | 26 -
patches/openjdk/8005615-failure_to_load_logger_implementation.patch | 542 -
patches/openjdk/8007393.patch | 78 -
patches/openjdk/8007611.patch | 24 -
patches/openjdk/8009641-8007675_build_fix.patch | 49 -
patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch | 449213 -------
patches/openjdk/jaxp144_05.patch | 595589 ----------
patches/security/20130201/6563318.patch | 36 -
patches/security/20130201/6664509.patch | 1322 -
patches/security/20130201/6776941.patch | 272 -
patches/security/20130201/7141694.patch | 87 -
patches/security/20130201/7173145.patch | 22 -
patches/security/20130201/7186945.patch | 10819 -
patches/security/20130201/7186948.patch | 20 -
patches/security/20130201/7186952.patch | 127 -
patches/security/20130201/7186954.patch | 81 -
patches/security/20130201/7192392.patch | 695 -
patches/security/20130201/7192393.patch | 60 -
patches/security/20130201/7192977.patch | 444 -
patches/security/20130201/7197546.patch | 479 -
patches/security/20130201/7200491.patch | 49 -
patches/security/20130201/7200500.patch | 60 -
patches/security/20130201/7201064.patch | 125 -
patches/security/20130201/7201066.patch | 66 -
patches/security/20130201/7201068.patch | 83 -
patches/security/20130201/7201070.patch | 31 -
patches/security/20130201/7201071.patch | 553 -
patches/security/20130201/8000210.patch | 104 -
patches/security/20130201/8000537.patch | 334 -
patches/security/20130201/8000540.patch | 187 -
patches/security/20130201/8000631.patch | 3964 -
patches/security/20130201/8001242.patch | 61 -
patches/security/20130201/8001307.patch | 27 -
patches/security/20130201/8001972.patch | 438 -
patches/security/20130201/8002325.patch | 59 -
patches/security/20130219/8006446.patch | 395 -
patches/security/20130219/8006777.patch | 1036 -
patches/security/20130219/8007688.patch | 130 -
patches/security/20130304/8007014.patch | 477 -
patches/security/20130304/8007675.patch | 416 -
patches/security/20130416/6657673.patch | 400 +-
patches/security/20130416/8005432.patch | 48 +-
62 files changed, 811 insertions(+), 1069246 deletions(-)
diffs (truncated from 1071369 to 500 lines):
diff -r ce006f6558f1 -r aa0c5db9e503 ChangeLog
--- a/ChangeLog Fri May 17 17:58:51 2013 +0200
+++ b/ChangeLog Fri May 31 15:05:33 2013 +0100
@@ -1,3 +1,79 @@
+2013-05-31 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/copy_memory.patch,
+ * patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch:
+ Drop upstreamed patches.
+ * Makefile.am:
+ (DROP_PATCHES): Remove JAXP patch.
+ (ICEDTEA_PATCHES): Remove OpenJDK6-4 patch.
+
+2013-05-15 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1458: Make use of bootstrap tools & -Xbootclasspath
+ patches optional
+ * INSTALL: Document --disable-bootstrap-tools.
+ * Makefile.am:
+ (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException
+ if any of the constructors are missing.
+ (ICEDTEA_ECJ_PATCHES): Split out fphexconstants,
+ no-sun-classes, bootstrap-tools and xbootclasspath
+ patches from icedtea.patch. Make the latter two
+ conditional.
+ * NEWS: Updated.
+ * acinclude.m4:
+ (IT_USE_BOOTSTRAP_TOOLS): Add --disable-bootstrap-tools
+ to decide whether to use the boot javac/javah or the
+ one built as part of langtools. Defaults to on.
+ (IT_CHECK_FOR_XBOOTCLASSPATH): Check whether java
+ can be passed -Xbootclasspath/p to prepend a path
+ to the bootclasspath or not.
+ * configure.ac: Invoke the new macros and test
+ for the java.sql.SQLException constructors.
+ * javac.in: Handle -Xbootclasspath/p, -Xbootclasspath
+ and -Xbootclasspath/a by prepending, setting or appending
+ its value to the bootclasspath option used to ecj,
+ respectively.
+ * patches/ecj/bootstrap-tools.patch:
+ Split from icedtea.patch. Uses the bootstrap
+ javac and javah rather than the langtools one for
+ CORBA and JDK.
+ * patches/ecj/corba-dependencies.patch:
+ Include the langtools source directory on the sourcepath.
+ * patches/ecj/fphexconstants.patch:
+ Split replacements of floating point hex constants out
+ from icedtea.patch.
+ * patches/ecj/icedtea.patch:
+ Remove split-out segements. Drop addition of ICEDTEA_RT
+ in BuildToolJar.gmk and common/Rules.gmk in JDK altogether,
+ along with setting of bootclasspath in langtools.
+ * patches/ecj/needs-6.patch:
+ Add java.awt Makefile.
+ * patches/ecj/no-sun-classes.patch:
+ Split from icedtea.patch. Appends ICEDTEA_CLS_DIR to the
+ bootclasspath in java.text, sun.text and sun.javazic
+ Makefiles for VMs without internal Sun classes.
+ * patches/ecj/xbootclasspath.patch:
+ Replaces the use of -Xbootclasspath in java.text,
+ sun.text and sun.javazic for those VMs that don't
+ support it (gcj).
+
+2013-05-20 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * patches/jtreg-TextLayoutBoundsChecks.patch:
+ Fixed wrong JTreg test name in @run annotation.
+
+2013-05-17 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/hotspot/original/7197906-handle_32_bit_shifts.patch,
+ * patches/hotspot/original/fix_get_stack_bounds_leak.patch,
+ * patches/openjdk/8004302-soap_test_failure.patch,
+ * patches/openjdk/jaxp144_05.patch:
+ Removed as available upstream.
+ * Makefile.am: Remove patches.
+ * patches/security/20130416/6657673.patch,
+ * patches/security/20130416/8005432.patch:
+ Regenerated against upstream.
+
2013-05-17 Pavel Tisnovsky <ptisnovs at redhat.com>
* patches/componentOrientationTests.patch:
@@ -15,6 +91,12 @@
* Makefile.am:
Renamed three patches to be more consistent with other JTreg-related patches.
+2013-05-15 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove reference to removed
+ patch patches/openjdk/8009641-8007675_build_fix.patch.
+
2013-05-15 Pavel Tisnovsky <ptisnovs at redhat.com>
* Makefile.am:
@@ -391,6 +473,62 @@
* patches/jvmtiEnv.patch: Moved to...
* patches/hotspot/original/jvmtiEnv.patch: here.
+2013-03-19 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/openjdk/8004341-jck_dialog_failure.patch,
+ * patches/openjdk/8005615-failure_to_load_logger_implementation.patch,
+ * patches/openjdk/8007393.patch,
+ * patches/openjdk/8007611.patch,
+ * patches/openjdk/8009641-8007675_build_fix.patch,
+ * patches/security/20130201/6563318.patch,
+ * patches/security/20130201/6664509.patch,
+ * patches/security/20130201/6776941.patch,
+ * patches/security/20130201/7141694.patch,
+ * patches/security/20130201/7173145.patch,
+ * patches/security/20130201/7186945.patch,
+ * patches/security/20130201/7186948.patch,
+ * patches/security/20130201/7186952.patch,
+ * patches/security/20130201/7186954.patch,
+ * patches/security/20130201/7192392.patch,
+ * patches/security/20130201/7192393.patch,
+ * patches/security/20130201/7192977.patch,
+ * patches/security/20130201/7197546.patch,
+ * patches/security/20130201/7200491.patch,
+ * patches/security/20130201/7200500.patch,
+ * patches/security/20130201/7201064.patch,
+ * patches/security/20130201/7201066.patch,
+ * patches/security/20130201/7201068.patch,
+ * patches/security/20130201/7201070.patch,
+ * patches/security/20130201/7201071.patch,
+ * patches/security/20130201/8000210.patch,
+ * patches/security/20130201/8000537.patch,
+ * patches/security/20130201/8000540.patch,
+ * patches/security/20130201/8000631.patch,
+ * patches/security/20130201/8001235.patch,
+ * patches/security/20130201/8001242.patch,
+ * patches/security/20130201/8001307.patch,
+ * patches/security/20130201/8001972.patch,
+ * patches/security/20130201/8002325.patch,
+ * patches/security/20130219/8006446.patch,
+ * patches/security/20130219/8006777.patch,
+ * patches/security/20130219/8007688.patch,
+ * patches/security/20130304/8007014.patch,
+ * patches/security/20130304/8007675.patch:
+ Remove patches available upstream.
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Update to jaxp144_05.zip
+ with latest security fix included.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Remove ones available
+ upstream (all from 2013/02/01, 2013/02/19
+ and 2013/03/04).
+ (ICEDTEA_PATCHES): Remove patches for
+ 8005615, 8004341, 8007393 & 8007611
+ available upstream.
+ * patches/ecj/override.patch:
+ Add new case introduced by upstream version
+ of security patches (sigh...)
+
2013-03-18 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
@@ -992,6 +1130,11 @@
2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b28.
+
+2012-10-31 Andrew John Hughes <gnu.andrew at redhat.com>
+
* generated/com/sun/corba/se/impl/logging/ActivationSystemException.java,
* generated/com/sun/corba/se/impl/logging/IORSystemException.java,
* generated/com/sun/corba/se/impl/logging/InterceptorsSystemException.java,
diff -r ce006f6558f1 -r aa0c5db9e503 INSTALL
--- a/INSTALL Fri May 17 17:58:51 2013 +0200
+++ b/INSTALL Fri May 31 15:05:33 2013 +0100
@@ -154,6 +154,7 @@
* --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
* --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
* --with-llvm-config: Specify the location of the llvm-config binary.
+* --disable-bootstrap-tools: Use javac and javah from langtools, not the bootstrap JDK.
Other options may be supplied which enable or disable new features.
These are documented fully in the relevant section below.
@@ -191,7 +192,7 @@
PulseAudio which can be enabled using --enable-pulse-java. The resulting
provider is org.classpath.icedtea.pulseaudio.PulseAudioMixerProvider.
-Xrender Support
+XRender Support
===============
IcedTea6 includes support for an Xrender-based rendering pipeline
@@ -329,7 +330,7 @@
other than x86/x86_64/sparc). As 'hs23' is known not to work with
Zero or Shark, 'original' is still the default for these builds.
-Javascript Support
+JavaScript Support
==================
IcedTea6 adds Javascript support via the javax.script API by using
@@ -348,6 +349,14 @@
avoids conflicts between the JDK's copy of Rhino and any used by other
applications.
+Bootstrap Tools
+===============
+
+For bootstrap builds, the option --disable-bootstrap-tools can be used
+to make use of the javac and javah built as part of the langtools build,
+rather than the bootstrap tools. The default setting of this option is
+to use the bootstrap tools.
+
Building Additional Virtual Machines
====================================
diff -r ce006f6558f1 -r aa0c5db9e503 Makefile.am
--- a/Makefile.am Fri May 17 17:58:51 2013 +0200
+++ b/Makefile.am Fri May 31 15:05:33 2013 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 26_oct_2012
OPENJDK_SHA256SUM = 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0
-OPENJDK_VERSION = b27
+OPENJDK_VERSION = b28
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = 68fe50ac34ec
@@ -140,6 +140,27 @@
$(SHARE)/javax/net/ssl/KeyStoreBuilderParameters.java
endif
+#PR57420 - java.sql.SQLException
+if LACKS_JAVA_SQL_EXCEPTION_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+else
+if LACKS_JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+ $(SHARE)/java/sql/SQLException.java
+endif
+endif
+endif
+endif
+
# Flags
MEMORY_LIMIT = -J-Xmx1024m
IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -257,48 +278,12 @@
ICEDTEA_FSG_PATCHES =
-DROP_PATCHES = \
- patches/openjdk/jaf-b20_jaxws2-1_6_2011_06_13.patch \
- patches/openjdk/jaxp144_05.patch
+DROP_PATCHES =
SECURITY_PATCHES = \
patches/security/20120830/7182135-impossible_to_use_some_editors_directly.patch \
- patches/security/20130201/7201068.patch \
- patches/security/20130201/6563318.patch \
- patches/security/20130201/6664509.patch \
- patches/security/20130201/6776941.patch \
- patches/security/20130201/7141694.patch \
- patches/security/20130201/7173145.patch \
- patches/security/20130201/7186945.patch \
- patches/security/20130201/7186948.patch \
- patches/security/20130201/7186952.patch \
- patches/security/20130201/7186954.patch \
- patches/security/20130201/7192392.patch \
- patches/security/20130201/7192393.patch \
- patches/security/20130201/7192977.patch \
- patches/security/20130201/7197546.patch \
- patches/security/20130201/7200491.patch \
- patches/security/20130201/7200500.patch \
- patches/security/20130201/7201064.patch \
- patches/security/20130201/7201066.patch \
- patches/security/20130201/7201070.patch \
- patches/security/20130201/7201071.patch \
- patches/security/20130201/8000210.patch \
- patches/security/20130201/8000537.patch \
- patches/security/20130201/8000540.patch \
- patches/security/20130201/8000631.patch \
- patches/security/20130201/8001242.patch \
- patches/security/20130201/8001972.patch \
- patches/security/20130201/8002325.patch \
- patches/security/20130219/8006446.patch \
- patches/security/20130219/8006777.patch \
- patches/security/20130219/8007688.patch \
- patches/security/20130304/8007014.patch \
- patches/security/20130304/8007675.patch \
- patches/openjdk/8009641-8007675_build_fix.patch \
patches/openjdk/7036559-concurrenthashmap_improvements.patch \
patches/security/20130416/8009063.patch \
- patches/openjdk/8004302-soap_test_failure.patch \
patches/security/20130416/6657673.patch \
patches/security/20130416/6657673-fixup.patch \
patches/openjdk/7133220-factory_finder_parser_transform_useBSClassLoader.patch \
@@ -337,7 +322,6 @@
if !WITH_ALT_HSBUILD
SECURITY_PATCHES += \
- patches/security/20130201/8001307.patch \
patches/security/20130416/8004336.patch \
patches/security/20130416/8006309.patch \
patches/security/20130416/8009699.patch
@@ -530,12 +514,7 @@
patches/openjdk/6980681-corba_deadlock.patch \
patches/openjdk/7162902-corba_fixes.patch \
patches/traceable.patch \
- patches/openjdk/8005615-failure_to_load_logger_implementation.patch \
- patches/openjdk/8004341-jck_dialog_failure.patch \
patches/pr1319-support_giflib_5.patch \
- patches/openjdk/8007393.patch \
- patches/openjdk/8007611.patch \
- patches/copy_memory.patch \
patches/openjdk/6718364-inference_failure.patch \
patches/openjdk/6682380-foreach_crash.patch \
patches/openjdk/7046929-fix_t6397104_test_failure.patch \
@@ -596,8 +575,6 @@
patches/pr696-zero-fast_aldc-hs20.patch \
patches/arm-debug.patch \
patches/openjdk/7010849-modernise_sa.patch \
- patches/hotspot/original/7197906-handle_32_bit_shifts.patch \
- patches/hotspot/original/fix_get_stack_bounds_leak.patch \
patches/hotspot/original/jvmtiEnv.patch \
patches/hotspot/original/6840152-jvm_crashes_with_heavyweight_monitors.patch \
patches/hotspot/original/aarch64.patch \
@@ -678,7 +655,9 @@
patches/ecj/corba-dependencies.patch \
patches/ecj/jaxws-langtools-dependency.patch \
patches/ecj/jaxws-jdk-dependency.patch \
- patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch
+ patches/ecj/hotspot/$(HSBUILD)/hotspot-jdk-dependency.patch \
+ patches/ecj/fphexconstants.patch \
+ patches/ecj/no-sun-classes.patch
if DTDTYPE_QNAME
ICEDTEA_ECJ_PATCHES += \
@@ -692,6 +671,16 @@
endif
endif
+if !DISABLE_BOOTSTRAP_TOOLS
+ICEDTEA_ECJ_PATCHES += \
+ patches/ecj/bootstrap-tools.patch
+endif
+
+if !VM_SUPPORTS_XBOOTCLASSPATH
+ICEDTEA_ECJ_PATCHES += \
+ patches/ecj/xbootclasspath.patch
+endif
+
if !WITH_PAX
ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
endif
diff -r ce006f6558f1 -r aa0c5db9e503 NEWS
--- a/NEWS Fri May 17 17:58:51 2013 +0200
+++ b/NEWS Fri May 31 15:05:33 2013 +0100
@@ -15,6 +15,7 @@
* New features
- PR1317: Provide an option to build with a more up-to-date HotSpot
+ - PR1458: Make use of bootstrap tools & -Xbootclasspath patches optional
* Backports
- S8009641: OpenJDK 6 build broken via 8007675 fix
- OJ4: Backport the new version of copyMemory from OpenJDK 7 to allow Snappy to build
diff -r ce006f6558f1 -r aa0c5db9e503 acinclude.m4
--- a/acinclude.m4 Fri May 17 17:58:51 2013 +0200
+++ b/acinclude.m4 Fri May 31 15:05:33 2013 +0100
@@ -1933,6 +1933,67 @@
AC_PROVIDE([$0])dnl
])
+AC_DEFUN_ONCE([IT_USE_BOOTSTRAP_TOOLS],
+[
+ AC_MSG_CHECKING([whether to disable the use of bootstrap tools for bootstrapping])
+ AC_ARG_ENABLE([bootstrap-tools],
+ [AS_HELP_STRING(--disable-bootstrap-tools,
+ disable the use of bootstrap tools for bootstrapping [[default=no]])],
+ [
+ case "${enableval}" in
+ no)
+ disable_bootstrap_tools=yes
+ ;;
+ *)
+ disable_bootstrap_tools=no
+ ;;
+ esac
+ ],
+ [
+ disable_bootstrap_tools=no;
+ ])
+ AC_MSG_RESULT([$disable_bootstrap_tools])
+ AM_CONDITIONAL([DISABLE_BOOTSTRAP_TOOLS], test x"${disable_bootstrap_tools}" = "xyes")
+])
+
+AC_DEFUN_ONCE([IT_CHECK_FOR_XBOOTCLASSPATH],
+[
+ AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
+ AC_CACHE_CHECK([if the VM supports -Xbootclasspath], it_cv_xbootclasspath_works, [
+ 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)
+ {
+ System.out.println("Hello World!");
+ }
+}]
+EOF
+ mkdir build
+ if $JAVAC -d build -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -Xbootclasspath/p:build $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_xbootclasspath_works=yes;
+ else
+ it_cv_xbootclasspath_works=no;
+ fi
+ else
+ it_cv_xbootclasspath_works=no;
+ fi
+ rm -f $CLASS build/*.class
+ rmdir build
+ cd ..
+ rmdir tmp.$$
+ ])
+ AC_PROVIDE([$0])dnl
+ AM_CONDITIONAL([VM_SUPPORTS_XBOOTCLASSPATH], test x"${it_cv_xbootclasspath_works}" = "xyes")
+])
+
AC_DEFUN_ONCE([IT_WITH_PAX],
[
AC_MSG_CHECKING([for pax utility to use])
diff -r ce006f6558f1 -r aa0c5db9e503 configure.ac
--- a/configure.ac Fri May 17 17:58:51 2013 +0200
+++ b/configure.ac Fri May 31 15:05:33 2013 +0100
@@ -154,6 +154,12 @@
[new javax.net.ssl.KeyStoreBuilderParameters(new java.util.ArrayList<java.security.KeyStore.Builder>()).getParameters()]
)
+dnl PR57420 - java.sql.SQLException
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_THROWABLE],[java.sql.SQLException],[Throwable.class],[new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_THROWABLE],[java.sql.SQLException],[String.class,Throwable.class],["Something went wrong",new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Throwable.class],["Something went wrong","",new Throwable()])
+IT_CHECK_FOR_CONSTRUCTOR([JAVA_SQL_EXCEPTION_REASON_STATE_CODE_THROWABLE],[java.sql.SQLException],[String.class,String.class,Integer.TYPE,Throwable.class],["Something went wrong","",666,new Throwable()])
+
# Use xvfb-run if found to run gui tests (check-jdk).
AC_CHECK_PROG(XVFB_RUN_CMD, xvfb-run, [xvfb-run -a -e xvfb-errors], [])
AC_SUBST(XVFB_RUN_CMD)
@@ -254,6 +260,9 @@
AC_CONFIG_FILES([javac], [chmod +x javac])
AC_CONFIG_FILES([javap], [chmod +x javap])
+IT_USE_BOOTSTRAP_TOOLS
+IT_CHECK_FOR_XBOOTCLASSPATH
+
IT_FIND_RHINO_JAR
IT_WITH_OPENJDK_SRC_ZIP
IT_WITH_HOTSPOT_SRC_ZIP
diff -r ce006f6558f1 -r aa0c5db9e503 javac.in
--- a/javac.in Fri May 17 17:58:51 2013 +0200
+++ b/javac.in Fri May 31 15:05:33 2013 +0100
@@ -7,7 +7,29 @@
my $JAVAC_WARNINGS="-nowarn";
my @bcoption;
-push @bcoption, '-bootclasspath', glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar'
+my @bcoptionsp = grep {$_ =~ '^-Xbootclasspath/p:' } @ARGV;
+my @bcoptions = grep {$_ =~ '^-Xbootclasspath:' } @ARGV;
+my @bcoptionsa = grep {$_ =~ '^-Xbootclasspath/a:' } @ARGV;
+my $bcp = $bcoptionsp[0];
+my $bc = $bcoptions[0];
+my $bca = $bcoptionsa[0];
+my $systembc = glob '@abs_top_builddir@/bootstrap/jdk1.6.0/jre/lib/rt.jar';
+if ($bcp)
+{
+ $bcp =~ s/^[^:]*://;
+ $systembc = join ":", $bcp, $systembc;
+}
+if ($bc)
+{
+ $bc =~ s/^[^:]*://;
+ $systembc = $bc;
+}
+if ($bca)
+{
+ $bca =~ s/^[^:]*://;
+ $systembc = join ":", $systembc, $bca;
More information about the distro-pkg-dev
mailing list