Mercurial > hg > release > icedtea7-2.4

view patches/boot/openjdk6-prefer_source.patch @ 2689:6c64497ab921

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR1623: Collision between OpenJDK 6 & 7 classes when bootstrapping with OpenJDK 6 2013-12-17 Andrew John Hughes <gnu.andrew@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.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 18 Dec 2013 00:32:15 +0000
parents
children
line wrap: on
line source

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
 
 #