/hg/release/icedtea7-2.4: PR1623: Collision between OpenJDK 6 & ...

[andrew at icedtea.classpath.org]

changeset 6c64497ab921 in /hg/release/icedtea7-2.4
details: http://icedtea.classpath.org/hg/release/icedtea7-2.4?cmd=changeset;node=6c64497ab921
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Wed Dec 18 00:32:15 2013 +0000

	PR1623: Collision between OpenJDK 6 & 7 classes when bootstrapping with OpenJDK 6

	2013-12-17  Andrew John Hughes  <gnu.andrew at redhat.com>

		* Makefile.am:
		(ICEDTEA_BOOT_PATCHES): Enable new patch when
		not using bootstrap tools.
		* NEWS: Updated.
		* patches/boot/openjdk6-prefer_source.patch:
		Pass -Xprefer:source to just-built javac.  The
		bootstrap version already has it in javac.in.


diffstat:

 ChangeLog                                 |  10 +++++
 Makefile.am                               |   7 ++-
 NEWS                                      |   1 +
 patches/boot/openjdk6-prefer_source.patch |  58 +++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 3 deletions(-)

diffs (107 lines):

diff -r 94ea13f357b0 -r 6c64497ab921 ChangeLog
--- a/ChangeLog	Sat Dec 14 00:00:26 2013 +0000
+++ b/ChangeLog	Wed Dec 18 00:32:15 2013 +0000
@@ -1,3 +1,13 @@
+2013-12-17  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_BOOT_PATCHES): Enable new patch when
+	not using bootstrap tools.
+	* NEWS: Updated.
+	* patches/boot/openjdk6-prefer_source.patch:
+	Pass -Xprefer:source to just-built javac.  The
+	bootstrap version already has it in javac.in.
+
 2013-12-12  Andrew John Hughes  <gnu.andrew at redhat.com>
 
 	* Makefile.am:
diff -r 94ea13f357b0 -r 6c64497ab921 Makefile.am
--- a/Makefile.am	Sat Dec 14 00:00:26 2013 +0000
+++ b/Makefile.am	Wed Dec 18 00:32:15 2013 +0000
@@ -341,9 +341,10 @@
 	patches/boot/xsltproc.patch \
 	patches/boot/ecj-odd.patch
 
-if !DISABLE_BOOTSTRAP_TOOLS
-ICEDTEA_BOOT_PATCHES += \
-	patches/boot/bootstrap-tools.patch
+if DISABLE_BOOTSTRAP_TOOLS
+ICEDTEA_BOOT_PATCHES += patches/boot/openjdk6-prefer_source.patch
+else
+ICEDTEA_BOOT_PATCHES += patches/boot/bootstrap-tools.patch
 endif
 
 if !VM_SUPPORTS_XBOOTCLASSPATH
diff -r 94ea13f357b0 -r 6c64497ab921 NEWS
--- a/NEWS	Sat Dec 14 00:00:26 2013 +0000
+++ b/NEWS	Wed Dec 18 00:32:15 2013 +0000
@@ -19,6 +19,7 @@
 * Bug fixes
   - PR1618: Include defs.make in vm.make so VM_LITTLE_ENDIAN is defined on Zero builds
   - D729448: 32-bit alignment on mips and mipsel
+  - PR1623: Collision between OpenJDK 6 & 7 classes when bootstrapping with OpenJDK 6
 
 New in release 2.4.3 (2013-10-21):
 
diff -r 94ea13f357b0 -r 6c64497ab921 patches/boot/openjdk6-prefer_source.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/openjdk6-prefer_source.patch	Wed Dec 18 00:32:15 2013 +0000
@@ -0,0 +1,58 @@
+diff -r 18ee4113fc37 make/com/sun/crypto/provider/Makefile
+--- openjdk-boot/jdk/make/com/sun/crypto/provider/Makefile	Fri Nov 08 19:32:09 2013 +0000
++++ openjdk-boot/jdk/make/com/sun/crypto/provider/Makefile	Tue Dec 17 17:42:08 2013 +0000
+@@ -113,6 +113,7 @@
+   endif
+ endif
+ 
++OTHER_JAVACFLAGS += -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ #
+diff -r 18ee4113fc37 make/java/jar/Makefile
+--- openjdk-boot/jdk/make/java/jar/Makefile	Fri Nov 08 19:32:09 2013 +0000
++++ openjdk-boot/jdk/make/java/jar/Makefile	Tue Dec 17 17:42:08 2013 +0000
+@@ -26,6 +26,8 @@
+ BUILDDIR = ../..
+ PACKAGE = java.util.jar
+ PRODUCT = sun
++
++OTHER_JAVACFLAGS += -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ #
+diff -r 18ee4113fc37 make/sun/nio/cs/Makefile
+--- openjdk-boot/jdk/make/sun/nio/cs/Makefile	Fri Nov 08 19:32:09 2013 +0000
++++ openjdk-boot/jdk/make/sun/nio/cs/Makefile	Tue Dec 17 17:42:08 2013 +0000
+@@ -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
+ 
+ #
+diff -r 18ee4113fc37 make/sun/security/other/Makefile
+--- openjdk-boot/jdk/make/sun/security/other/Makefile	Fri Nov 08 19:32:09 2013 +0000
++++ openjdk-boot/jdk/make/sun/security/other/Makefile	Tue Dec 17 17:42:08 2013 +0000
+@@ -26,6 +26,8 @@
+ BUILDDIR = ../../..
+ PACKAGE = sun.security.other
+ PRODUCT = sun
++
++OTHER_JAVACFLAGS += -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ #
+diff -r 18ee4113fc37 make/sun/security/pkcs11/Makefile
+--- openjdk-boot/jdk/make/sun/security/pkcs11/Makefile	Fri Nov 08 19:32:09 2013 +0000
++++ openjdk-boot/jdk/make/sun/security/pkcs11/Makefile	Tue Dec 17 17:42:08 2013 +0000
+@@ -110,6 +110,7 @@
+   endif
+ endif
+ 
++OTHER_JAVACFLAGS += -Xprefer:source
+ include $(BUILDDIR)/common/Defs.gmk
+ 
+ #