Avoid referring to the bootstrap runtime library when compiling the JDK, so as to avoid version conflicts. 2013-07-09 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (ICEDTEA_ECJ_PATCHES): Add new patch. * patches/ecj/jcp-importsources.patch: Include imported JAXP sources in sourcepath when building org.jcp code. 2013-07-09 Omair Majid <omajid@redhat.com> * patches/ecj/needs-6.patch: Build additional code using -source 6. 2013-05-15 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am: (ICEDTEA_BOOTSTRAP_CLASSES): Add java.sql.SQLException. (ICEDTEA_ECJ_PATCHES): Split out fphexconstants, no-sun-classes, bootstrap-tools and xbootclasspath patches from icedtea.patch. Make the latter two conditional. * 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/icedtea.patch: Drop addition of ICEDTEA_RT in common/Rules.gmk in JDK altogether. * patches/ecj/needs-6.patch: Add java.awt Makefile.

--- openjdk-ecj/jdk/make/org/jcp/Makefile.orig	2013-07-10 10:02:13.715336690 +0100
+++ openjdk-ecj/jdk/make/org/jcp/Makefile	2013-07-10 10:02:55.359996584 +0100
@@ -31,6 +31,7 @@
 PACKAGE = org.jcp
 PRODUCT = jcp
 include $(BUILDDIR)/common/Defs.gmk
+SOURCEPATH = $(IMPORTSRCDIR)$(CLASSPATH_SEPARATOR)$(VPATH0.java)
 
 #
 # Files to compile