/hg/icedtea6-hg: 19 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Tue Jan 29 18:03:32 PST 2013


changeset de38248f4db4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=de38248f4db4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 11 17:11:43 2013 +0000

	Explicitly test for the presence of Classpath bug PR43389 and only pre-build StandardMBean if present.

	2013-01-11  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
		of javax.management.StandardMBean dependent on
		the 1.6 constructors being missing.
		* acinclude.m4:
		(IT_CHECK_FOR_CLASS): Write class toString() output
		to System.err rather than throwing it away.  It then
		appears in config.log and may be useful in debugging.
		(IT_CHECK_FOR_METHOD): Fix documentation and add
		System.err output as for IT_CHECK_FOR_CLASS.
		(IT_CHECK_FOR_CONSTRUCTOR): New macro to test for
		the presence of a specific constructor.  Works
		with both private & protected constructors by
		using a subclass for the compile test.
		* configure.ac:
		Add IT_CHECK_FOR_CONSTRUCTOR calls for the
		two javax.management.StandardMBean constructors
		added in 1.6.


changeset 5c5bde48dfb9 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5c5bde48dfb9
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jan 21 19:56:33 2013 +0000

	Only copy tz.properties if the destination exists.  Do it verbosely.

	2013-01-14  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		(add-tzdata-support): Only copy tz.properties if
		destination exists.  Do it verbosely.
		(clean-add-tzdata-support): Only remove tz.properties
		if present and do so verbosely.
		(add-tzdata-support-debug): Same as add-tzdata-support
		but for debug.
		(clean-add-tzdata-support-debug): Same as
		clean-add-tzdata-support but for debug.
		(add-tzdata-support-ecj): Same as add-tzdata-support
		but for bootstrap.
		(clean-add-tzdata-support-ecj): Same as
		clean-add-tzdata-support but for bootstrap.


changeset cc35a9049bdd in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=cc35a9049bdd
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jan 21 21:46:50 2013 +0000

	PR1119: Detect whether required methods in java.security.cert.X509{Cert,CRL}Selector are actually missing.

	2013-01-21  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
		of java.security.cert.X509{Cert,CRL}Selector
		dependent on the necessary methods being missing.
		* configure.ac:
		Add IT_CHECK_FOR_METHOD calls for the
		missing java.security.cert.X509{Cert,CRL}Selector
		methods added in 1.5.


changeset 3465dd7f9596 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3465dd7f9596
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Mon Jan 21 22:34:53 2013 +0000

	Make the inclusion of javax.security.auth.kerberos.KerberosTicket dependent on getSessionKeyType() being missing.

	2013-01-21  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
		of javax.security.auth.kerberos.KerberosTicket
		dependent on getSessionKeyType() being missing.
		* configure.ac:
		Add IT_CHECK_FOR_METHOD calls for
		getSessionKeyType() which is missing in some
		older versions of GCJ and GNU Classpath (<0.99).


changeset bc8359665940 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=bc8359665940
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 22 13:53:18 2013 +0000

	JamVM PR1155: Do not put version number in libjvm.so SONAME

	2012-09-25  Xerxes Ranby  <xerxes at zafena.se>

		JamVM
		PR1155: Do not put version number in libjvm.so SONAME
		* NEWS: Updated.
		* Makefile.am
		(JAMVM_VERSION): Updated JamVM to 2012-09-25 revision.
		(JAMVM_SHA256SUM): Updated.


changeset 5c83d26b2437 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5c83d26b2437
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jan 23 20:58:41 2013 +0000

	CA172, PR1266, G453612: ARM hardfloat support for CACAO

	2013-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>

		CA172, PR1266: Add ARM hardfloat support to CACAO.
		* Makefile.am:
		(CACAO_VERSION): Updated to latest head.
		(CACAO_SHA256SUM): Likewise.
		* NEWS: List changes in CACAO since last revision.
		* patches/cacao/armhf.patch:
		Patch to enable hardfloat on triplet used by Gentoo.


changeset 14c3c86148a4 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=14c3c86148a4
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 15:16:55 2013 +0000

	Complete work on PR1119 by making javax.security.sasl.Sasl conditional and working with empty ICEDTEA_BOOTSTRAP_CLASSES.

	2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR1119: Only add classes to rt-source-files.txt if
		the class, or one or more of its methods/fields,
		are actually missing from the boot JDK
		* Makefile.am:
		(ICEDTEA_BOOTSTRAP_CLASSES):  Initialise to
		empty.  Make the inclusion of
		javax.security.sasl.Sasl dependent on the
		CREDENTIALS field being missing.
		* acinclude.m4:
		(IT_CHECK_FOR_STATIC_FIELD): New method to
		check for a static field.
		* configure.ac: Invoke IT_CHECK_FOR_STATIC_FIELD
		for javax.security.sasl.Sasl.CREDENTIALS.

	2012-08-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		(rt-class-files.stamp): Add test of contents of
		ICEDTEA_BOOTSTRAP_CLASSES.  Note; need to use grep as
		field contains whitespace.
		(rt.stamp): Likewise.

	2010-09-14  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am,
		(rt-source-files.txt): Remove any existing
		version prior to generation to avoid duplication
		of source files.


changeset b6442f2ba732 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=b6442f2ba732
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 15:20:00 2013 +0000

	Fix bad bug reference caught by Stefan Ring.

	2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Fix bad bug reference caught by
		Stefan Ring.


changeset 5c657c998832 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5c657c998832
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 19:30:32 2013 +0000

	Prepare for release.

	2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>

		* configure.ac: Set to 1.12.0.
		* NEWS: Add release date.


changeset 2bb62ac6d345 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=2bb62ac6d345
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 19:48:41 2013 +0000

	G422525: Apply pax markings before using a freshly built JVM.

	2012-06-24  Ralph Sennhauser  <sera at gentoo.org>

		* Makefile.am:
		(ICEDTEA_PATCHES): Replace HAS_PAX with
		WITH_PAX.  Add RMIC patch.
		(icedtea): Invoke pax-mark-vm on built image.
		(icedtea-ecj): Likewise.
		* acinclude.m4:
		(IT_WITH_PAX): New macro to specify pax utility.
		* configure.ac:
		Call IT_WITH_PAX instead of IT_CHECK_FOR_PAX.
		* patches/pax-mark-rmic-java.patch:
		New patch to PaX mark VM before running just-built
		rmic.


changeset 6af17f5442ff in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6af17f5442ff
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 21:28:47 2013 +0000

	Cleanup pax marking additions from Gentoo and mention in NEWS.

	2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(.PHONY): Add clean-pax-mark-vm,
		clean-pax-mark-vm-debug, clean-pax-mark-vm-ecj.
		(icedtea): Move pax-mark-vm invocation to
		its own rule.
		(icedtea-against-icedtea): Depend on pax-mark-vm.
		(clean-icedtea-against-icedtea): Likewise for
		clean-pax-mark-vm.
		(icedtea-debug-against-icedtea): Likewise for
		pax-mark-vm-debug.
		(clean-icedtea-debug-against-icedtea): Likewise for
		clean-pax-mark-vm-debug.
		(clean-add-archive): Delete the archive.
		(clean-add-archive-debug): Likewise for debug.
		(pax-mark-vm): Move pax marking to here.
		(clean-pax-mark-vm): And remove stamp here.
		(pax-mark-vm-debug): Pax marking for debug build.
		(clean-pax-mark-vm-debug): And remove stamp here.
		(icedtea-ecj): Move pax-mark-vm to its own rule.
		(icedtea-against-icedtea): Depend on pax-mark-vm-ecj.
		(clean-icedtea-against-icedtea): Likewise for
		clean-pax-mark-vm-ecj.
		(clean-add-archive-ecj): Delete the archive.
		(pax-mark-vm-ecj): Move ecj pax marking to here.
		(clean-pax-mark-vm-ecj): And remove stamp here.
		* acinclude.m4:
		(IT_CHECK_FOR_PAX): Remove now unused macro.
		* NEWS: Mention pax marking fixes.


changeset f6a0a42bf443 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f6a0a42bf443
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Jan 25 21:33:29 2013 +0000

	Add pax-mark-vm.in script template missing in earlier commit.

	2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>

		* pax-mark-vm.in: Add template for pax mark
		script.


changeset 5a1e1b396644 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=5a1e1b396644
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 29 01:21:09 2013 +0000

	PR986: IcedTea7 fails to build with IcedTea6 CACAO due to low max heap size

	2013-01-28  Andrew John Hughes  <gnu.andrew at redhat.com>

		* patches/cacao/memory.patch:
		Extend with additional cases in HotSpot and
		JAXWS.

	2012-06-12  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		PR986
		* Makefile.am:
		(ICEDTEA_PATCHES): Add memory patch when
		building using CACAO as well, even if the
		result is not a CACAO build.
		* acinclude.m4:
		(IT_USING_CACAO): New macro; detects use of
		CACAO as the build VM so memory limits can
		be raised accordingly.
		* configure.ac: Call IT_USING_CACAO.
		* NEWS: Updated.


changeset 69b6ee297123 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=69b6ee297123
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 29 04:11:25 2013 +0000

	Added tag icedtea6-1.12-branchpoint for changeset 5a1e1b396644


changeset 73dc59c4b6df in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=73dc59c4b6df
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 29 15:27:37 2013 +0000

	Update NEWS to match release announcement.

	2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Update to match announcement.


changeset 62524789314e in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=62524789314e
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 29 15:29:17 2013 +0000

	Prepare for 1.13.0.

	2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>

		* configure.ac: Bump to 1.13.0pre.
		* NEWS: Add 1.13.0 section.


changeset 3f4adb2d1fc2 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=3f4adb2d1fc2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Tue Jan 29 20:54:39 2013 +0000

	Fix the release date of 1.12.0; it is no longer 2012.

	2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Use the correct year; it is
		no longer 2012.


changeset d8acef41b7b6 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=d8acef41b7b6
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed Jan 30 00:52:15 2013 +0000

	Add missing bug ID.

	2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>

		* NEWS: Add missing bug ID.


changeset 6b20a50ba2fa in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=6b20a50ba2fa
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jan 30 01:18:32 2013 +0000

	Merge


diffstat:

 .hgtags                          |    1 +
 ChangeLog                        |  213 +++++++++++++++++++++++++++++++++++++++
 Makefile.am                      |  185 ++++++++++++++++++++++++++-------
 NEWS                             |   31 +++++-
 acinclude.m4                     |  206 ++++++++++++++++++++++++++++++++++---
 configure.ac                     |   53 +++++++++-
 patches/cacao/armhf.patch        |   12 ++
 patches/cacao/memory.patch       |   48 ++++++++
 patches/pax-mark-rmic-java.patch |   10 +
 pax-mark-vm.in                   |   13 ++
 10 files changed, 709 insertions(+), 63 deletions(-)

diffs (truncated from 1104 to 500 lines):

diff -r cea49ba2afcd -r 6b20a50ba2fa .hgtags
--- a/.hgtags	Wed Nov 28 14:42:31 2012 +0000
+++ b/.hgtags	Wed Jan 30 01:18:32 2013 +0000
@@ -21,3 +21,4 @@
 cb463b94b82da269ea089c481ed5e39700525a8a icedtea6-1.9-branchpoint
 21f2a8d158545a161ba0d997c13bdba1e6166394 icedtea6-1.10-branchpoint
 24c5bd2e7d574441813bfb8f9e4636e50c5d7c28 icedtea6-1.11-branchpoint
+5a1e1b39664409e9a0945ba49b558f25ef976c58 icedtea6-1.12-branchpoint
diff -r cea49ba2afcd -r 6b20a50ba2fa ChangeLog
--- a/ChangeLog	Wed Nov 28 14:42:31 2012 +0000
+++ b/ChangeLog	Wed Jan 30 01:18:32 2013 +0000
@@ -1,3 +1,211 @@
+2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Add missing bug ID.
+
+2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Use the correct year; it is
+	no longer 2012.
+
+2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac: Bump to 1.13.0pre.
+	* NEWS: Add 1.13.0 section.
+
+2013-01-29  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Update to match announcement.
+
+2013-01-28  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* patches/cacao/memory.patch:
+	Extend with additional cases in HotSpot and
+	JAXWS.
+
+2012-06-12  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	PR986
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add memory patch when
+	building using CACAO as well, even if the
+	result is not a CACAO build.
+	* acinclude.m4:
+	(IT_USING_CACAO): New macro; detects use of
+	CACAO as the build VM so memory limits can
+	be raised accordingly.
+	* configure.ac: Call IT_USING_CACAO.
+	* NEWS: Updated.
+
+2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* pax-mark-vm.in: Add template for pax mark
+	script.
+
+2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(.PHONY): Add clean-pax-mark-vm,
+	clean-pax-mark-vm-debug, clean-pax-mark-vm-ecj.
+	(icedtea): Move pax-mark-vm invocation to
+	its own rule.
+	(icedtea-against-icedtea): Depend on pax-mark-vm.
+	(clean-icedtea-against-icedtea): Likewise for
+	clean-pax-mark-vm.
+	(icedtea-debug-against-icedtea): Likewise for
+	pax-mark-vm-debug.
+	(clean-icedtea-debug-against-icedtea): Likewise for
+	clean-pax-mark-vm-debug.
+	(clean-add-archive): Delete the archive.
+	(clean-add-archive-debug): Likewise for debug.
+	(pax-mark-vm): Move pax marking to here.
+	(clean-pax-mark-vm): And remove stamp here.
+	(pax-mark-vm-debug): Pax marking for debug build.
+	(clean-pax-mark-vm-debug): And remove stamp here.
+	(icedtea-ecj): Move pax-mark-vm to its own rule.
+	(icedtea-against-icedtea): Depend on pax-mark-vm-ecj.
+	(clean-icedtea-against-icedtea): Likewise for
+	clean-pax-mark-vm-ecj.
+	(clean-add-archive-ecj): Delete the archive.
+	(pax-mark-vm-ecj): Move ecj pax marking to here.
+	(clean-pax-mark-vm-ecj): And remove stamp here.
+	* acinclude.m4:
+	(IT_CHECK_FOR_PAX): Remove now unused macro.
+	* NEWS: Mention pax marking fixes.
+
+2012-06-24  Ralph Sennhauser  <sera at gentoo.org>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Replace HAS_PAX with
+	WITH_PAX.  Add RMIC patch.
+	(icedtea): Invoke pax-mark-vm on built image.
+	(icedtea-ecj): Likewise.
+	* acinclude.m4:
+	(IT_WITH_PAX): New macro to specify pax utility.
+	* configure.ac:
+	Call IT_WITH_PAX instead of IT_CHECK_FOR_PAX.
+	* patches/pax-mark-rmic-java.patch:
+	New patch to PaX mark VM before running just-built
+	rmic.
+
+2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* configure.ac: Set to 1.12.0.
+	* NEWS: Add release date.
+
+2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* NEWS: Fix bad bug reference caught by
+	Stefan Ring.
+
+2013-01-25  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR1119: Only add classes to rt-source-files.txt if
+	the class, or one or more of its methods/fields,
+	are actually missing from the boot JDK
+	* Makefile.am:
+	(ICEDTEA_BOOTSTRAP_CLASSES):  Initialise to
+	empty.  Make the inclusion of
+	javax.security.sasl.Sasl dependent on the
+	CREDENTIALS field being missing.
+	* acinclude.m4:
+	(IT_CHECK_FOR_STATIC_FIELD): New method to
+	check for a static field.
+	* configure.ac: Invoke IT_CHECK_FOR_STATIC_FIELD
+	for javax.security.sasl.Sasl.CREDENTIALS.
+
+2012-08-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	(rt-class-files.stamp): Add test of contents of
+	ICEDTEA_BOOTSTRAP_CLASSES.  Note; need to use grep as
+	field contains whitespace.
+	(rt.stamp): Likewise.
+
+2010-09-14  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am,
+	(rt-source-files.txt): Remove any existing
+	version prior to generation to avoid duplication
+	of source files.
+
+2013-01-23  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	CA172, PR1266: Add ARM hardfloat support to CACAO.
+	* Makefile.am:
+	(CACAO_VERSION): Updated to latest head.
+	(CACAO_SHA256SUM): Likewise.
+	* NEWS: List changes in CACAO since last revision.
+	* patches/cacao/armhf.patch:
+	Patch to enable hardfloat on triplet used by Gentoo.
+
+2012-09-25  Xerxes RÃ¥nby  <xerxes at zafena.se>
+
+	JamVM
+	PR1155: Do not put version number in libjvm.so SONAME
+	* NEWS: Updated.
+	* Makefile.am
+	(JAMVM_VERSION): Updated JamVM to 2012-09-25 revision.
+	(JAMVM_SHA256SUM): Updated.
+
+2013-01-21  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
+	of javax.security.auth.kerberos.KerberosTicket
+	dependent on getSessionKeyType() being missing.
+	* configure.ac:
+	Add IT_CHECK_FOR_METHOD calls for
+	getSessionKeyType() which is missing in some
+	older versions of GCJ and GNU Classpath (<0.99).
+
+2013-01-21  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
+	of java.security.cert.X509{Cert,CRL}Selector
+	dependent on the necessary methods being missing.
+	* configure.ac:
+	Add IT_CHECK_FOR_METHOD calls for the
+	missing java.security.cert.X509{Cert,CRL}Selector
+	methods added in 1.5.
+
+2013-01-14  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	(add-tzdata-support): Only copy tz.properties if
+	destination exists.  Do it verbosely.
+	(clean-add-tzdata-support): Only remove tz.properties
+	if present and do so verbosely.
+	(add-tzdata-support-debug): Same as add-tzdata-support
+	but for debug.
+	(clean-add-tzdata-support-debug): Same as
+	clean-add-tzdata-support but for debug.
+	(add-tzdata-support-ecj): Same as add-tzdata-support
+	but for bootstrap.
+	(clean-add-tzdata-support-ecj): Same as
+	clean-add-tzdata-support but for bootstrap.
+
+2013-01-11  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_BOOTSTRAP_CLASSES): Make the inclusion
+	of javax.management.StandardMBean dependent on
+	the 1.6 constructors being missing.
+	* acinclude.m4:
+	(IT_CHECK_FOR_CLASS): Write class toString() output
+	to System.err rather than throwing it away.  It then
+	appears in config.log and may be useful in debugging.
+	(IT_CHECK_FOR_METHOD): Fix documentation and add
+	System.err output as for IT_CHECK_FOR_CLASS.
+	(IT_CHECK_FOR_CONSTRUCTOR): New macro to test for
+	the presence of a specific constructor.  Works
+	with both private & protected constructors by
+	using a subclass for the compile test.
+	* configure.ac:
+	Add IT_CHECK_FOR_CONSTRUCTOR calls for the
+	two javax.management.StandardMBean constructors
+	added in 1.6.
+
 2012-11-28  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* javac.in:
@@ -107,6 +315,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 cea49ba2afcd -r 6b20a50ba2fa Makefile.am
--- a/Makefile.am	Wed Nov 28 14:42:31 2012 +0000
+++ b/Makefile.am	Wed Jan 30 01:18:32 2013 +0000
@@ -2,17 +2,17 @@
 
 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 = 9968abd511a3
-CACAO_SHA256SUM = 3b1ce9d2205d2afba4614a194484341758ee2cb340396310ac2c00e5a2a20955
+CACAO_VERSION = 68fe50ac34ec
+CACAO_SHA256SUM = b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a
 CACAO_BASE_URL = http://icedtea.classpath.org/download/drops/cacao
 CACAO_URL = $(CACAO_BASE_URL)/$(CACAO_VERSION).tar.gz
 CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz
 
-JAMVM_VERSION = e70f2450890b82c37422616cc85e1a23385f03cd
-JAMVM_SHA256SUM = 3ca7e297ef4daa56c3dd733e21bce795d57ab071243369aa9400c0384ada8a4c
+JAMVM_VERSION = 0972452d441544f7dd29c55d64f1ce3a5db90d82
+JAMVM_SHA256SUM = bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03
 JAMVM_BASE_URL = http://icedtea.classpath.org/download/drops/jamvm
 JAMVM_URL = $(JAMVM_BASE_URL)/jamvm-$(JAMVM_VERSION).tar.gz
 JAMVM_SRC_ZIP = jamvm-$(JAMVM_VERSION).tar.gz
@@ -63,16 +63,7 @@
 
 # Sources used from OpenJDK.
 
-# PR42003 - javax.swing.plaf.basic.BasicDirectoryModel
-# PR43389 - javax.management.StandardMBean
-# PR54274 - sun.security.other requires missing X509CRLSelector methods
-# PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field
-ICEDTEA_BOOTSTRAP_CLASSES = \
-	$(SHARE)/javax/management/StandardMBean.java \
-	$(SHARE)/java/security/cert/X509CRLSelector.java \
-	$(SHARE)/java/security/cert/X509CertSelector.java \
-	$(SHARE)/javax/security/sasl/Sasl.java \
-	$(SHARE)/javax/security/auth/kerberos/KerberosTicket.java
+ICEDTEA_BOOTSTRAP_CLASSES =
 
 #PR42003 - Missing javax.swing.plaf.basic.BasicDirectoryModel methods cause OpenJDK build failure 
 if LACKS_JAVAX_SWING_PLAF_BASIC_BASICDIRECTORYMODEL_ADDPROPERTYCHANGELISTENER
@@ -88,6 +79,54 @@
 endif
 endif
 
+# PR43389 - javax.management.StandardMBean
+if LACKS_JAVAX_MANAGEMENT_STANDARDMBEAN_MXBEAN_TWO_ARG
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/javax/management/StandardMBean.java
+else
+if LACKS_JAVAX_MANAGEMENT_STANDARDMBEAN_MXBEAN_THREE_ARG
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/javax/management/StandardMBean.java
+endif
+endif
+
+# PR54274 - sun.security.other requires missing X509CRLSelector methods
+if LACKS_JAVA_SECURITY_CERT_X509CERTSELECTOR_GETSUBJECT
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/java/security/cert/X509CertSelector.java
+else
+if LACKS_JAVA_SECURITY_CERT_X509CERTSELECTOR_SETISSUER
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/java/security/cert/X509CertSelector.java
+else
+if LACKS_JAVA_SECURITY_CERT_X509CERTSELECTOR_SETSUBJECT
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/java/security/cert/X509CertSelector.java
+endif
+endif
+endif
+if LACKS_JAVA_SECURITY_CERT_X509CRLSELECTOR_ADDISSUER
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/java/security/cert/X509CRLSelector.java
+if LACKS_JAVA_SECURITY_CERT_X509CRLSELECTOR_SETISSUERS
+else
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/java/security/cert/X509CRLSelector.java
+endif
+endif
+
+# PR41686 - Building sun.security.jgss.GSSUtil requires javax.security.auth.kerberos.KerberosTicket.getSessionKeyType()
+if LACKS_JAVAX_SECURITY_AUTH_KERBEROS_KERBEROSTICKET_GETSESSIONKEYTYPE
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/javax/security/auth/kerberos/KerberosTicket.java
+endif
+
+# PR54275 - sun.security.sasl requires missing Sasl.CREDENTIALS field
+if LACKS_JAVAX_SECURITY_SASL_SASL_CREDENTIALS
+ICEDTEA_BOOTSTRAP_CLASSES += \
+	$(SHARE)/javax/security/sasl/Sasl.java
+endif
+
 # Flags
 MEMORY_LIMIT = -J-Xmx1024m
 IT_CFLAGS=$(CFLAGS) $(ARCHFLAG)
@@ -441,8 +480,14 @@
 if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/launcher.patch \
+	patches/cacao/memory.patch \
+	patches/cacao/armhf.patch
+else
+if USING_CACAO
+ICEDTEA_PATCHES += \
 	patches/cacao/memory.patch
 endif
+endif
 
 if ENABLE_PULSE_JAVA
 ICEDTEA_PATCHES += \
@@ -471,8 +516,10 @@
 NSS_PATCHES = patches/nss-not-enabled-config.patch
 endif
 
-if HAS_PAX
-ICEDTEA_PATCHES += patches/no-test_gamma.patch
+if WITH_PAX
+ICEDTEA_PATCHES += \
+	patches/no-test_gamma.patch \
+	patches/pax-mark-rmic-java.patch
 endif
 
 ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES)
@@ -507,7 +554,7 @@
 endif
 endif
 
-if !HAS_PAX
+if !WITH_PAX
 ICEDTEA_ECJ_PATCHES += patches/ecj/no-test_gamma.patch
 endif
 
@@ -721,7 +768,8 @@
 	clean-add-pulseaudio clean-add-pulseaudio-debug clean-add-nss clean-add-nss-debug \
 	clean-add-tzdata-support clean-add-tzdata-support-debug clean-add-systemtap-ecj \
 	clean-add-pulseaudio-ecj clean-add-nss-ecj clean-add-tzdata-support-ecj clean-fonts \
-	clean-download-hotspot clean-tests clean-tapset-report jtregcheck
+	clean-download-hotspot clean-tests clean-tapset-report jtregcheck clean-pax-mark-vm \
+	clean-pax-mark-vm-debug clean-pax-mark-vm-ecj
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -1523,27 +1571,28 @@
 
 stamps/icedtea-against-icedtea.stamp: stamps/icedtea.stamp \
  stamps/add-jamvm.stamp stamps/add-cacao.stamp stamps/add-zero.stamp \
- stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp stamps/add-tzdata-support.stamp \
- stamps/add-archive.stamp
+ stamps/add-systemtap.stamp stamps/add-pulseaudio.stamp stamps/add-nss.stamp \
+ stamps/add-tzdata-support.stamp stamps/add-archive.stamp stamps/pax-mark-vm.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-icedtea.stamp
 
 clean-icedtea-against-icedtea: clean-add-jamvm clean-add-zero clean-add-cacao \
  clean-add-systemtap clean-add-pulseaudio clean-add-nss clean-add-tzdata-support \
- clean-add-archive
+ clean-add-archive clean-pax-mark-vm
 	rm -f stamps/icedtea-against-icedtea.stamp
 
 stamps/icedtea-debug-against-icedtea.stamp: stamps/icedtea-debug.stamp \
  stamps/add-jamvm-debug.stamp stamps/add-cacao-debug.stamp \
  stamps/add-zero-debug.stamp stamps/add-systemtap-debug.stamp stamps/add-pulseaudio-debug.stamp \
- stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp
+ stamps/add-nss-debug.stamp stamps/add-tzdata-support-debug.stamp stamps/add-archive-debug.stamp \
+ stamps/pax-mark-vm-debug.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-debug-against-icedtea.stamp
 
 clean-icedtea-debug-against-icedtea: clean-add-zero-debug \
  clean-add-jamvm-debug clean-add-cacao-debug clean-add-systemtap-debug \
  clean-add-pulseaudio-debug clean-add-nss-debug clean-add-tzdata-support-debug \
- clean-add-archive-debug
+ clean-add-archive-debug clean-pax-mark-vm-debug
 	rm -f stamps/icedtea-debug-against-icedtea.stamp
 
 stamps/add-systemtap.stamp: stamps/icedtea.stamp
@@ -1757,24 +1806,32 @@
 
 stamps/add-tzdata-support.stamp: stamps/icedtea.stamp
 if WITH_TZDATA_DIR
-	cp $(abs_top_builddir)/tz.properties \
-	  $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib
+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	  cp -v $(abs_top_builddir)/tz.properties \
+	    $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ; \
+	fi
 endif
 	touch stamps/add-tzdata-support.stamp
 
 clean-add-tzdata-support:
-	rm -f $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+	if [ -e $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+	  rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	fi
 	rm -f stamps/add-tzdata-support.stamp
 
 stamps/add-tzdata-support-debug.stamp: stamps/icedtea-debug.stamp
 if WITH_TZDATA_DIR
-	cp $(abs_top_builddir)/tz.properties \
-	  $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib;
+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib ] ; then \
+	  cp -v $(abs_top_builddir)/tz.properties \
+	    $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib; \
+	fi
 endif
 	touch stamps/add-tzdata-support-debug.stamp
 
 clean-add-tzdata-support-debug:
-	rm -f $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties
+	if [ -e $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ] ; then \
+	  rm -vf $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/tz.properties ; \
+	fi
 	rm -f stamps/add-tzdata-support-debug.stamp
 
 stamps/add-archive.stamp: stamps/icedtea.stamp
@@ -1788,6 +1845,7 @@
 	touch stamps/add-archive.stamp
 
 clean-add-archive:
+	rm -vf $(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/*/*.jsa
 	rm -f stamps/add-archive.stamp
 
 stamps/add-archive-debug.stamp: stamps/icedtea-debug.stamp
@@ -1801,8 +1859,27 @@
 	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 -f stamps/add-archive-debug.stamp
 
+stamps/pax-mark-vm.stamp: stamps/icedtea.stamp
+if WITH_PAX
+	$(abs_top_builddir)/pax-mark-vm $(BUILD_OUTPUT_DIR)/j2sdk-image
+endif
+	touch $@
+
+clean-pax-mark-vm:
+	rm -f stamps/pax-mark-vm.stamp
+
+stamps/pax-mark-vm-debug.stamp: stamps/icedtea-debug.stamp
+if WITH_PAX
+	$(abs_top_builddir)/pax-mark-vm $(DEBUG_BUILD_OUTPUT_DIR)/j2sdk-image
+endif
+	touch $@
+
+clean-pax-mark-vm-debug:
+	rm -f stamps/pax-mark-vm-debug.stamp
+
 # OpenJDK ecj Targets
 # ===================
 
@@ -1824,12 +1901,12 @@
 
 stamps/icedtea-against-ecj.stamp: stamps/icedtea-ecj.stamp stamps/add-systemtap-ecj.stamp \
  stamps/add-pulseaudio-ecj.stamp stamps/add-nss-ecj.stamp stamps/add-tzdata-support-ecj.stamp \
- stamps/add-archive-ecj.stamp
+ stamps/add-archive-ecj.stamp stamps/pax-mark-vm-ecj.stamp
 	mkdir -p stamps
 	touch stamps/icedtea-against-ecj.stamp
 
 clean-icedtea-against-ecj: clean-add-systemtap-ecj clean-add-pulseaudio-ecj clean-add-nss-ecj \



More information about the distro-pkg-dev mailing list