Mercurial > hg > release > icedtea6-1.11
view patches/ecj/needs-6.patch @ 2916:ebb668a814fc
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.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Wed, 10 Jul 2013 12:31:16 +0100 |
| parents | f352f5c79104 |
| children |
line wrap: on
line source
diff -Nru openjdk-ecj.orig/jdk/make/sun/awt/Makefile openjdk-ecj/jdk/make/sun/awt/Makefile --- openjdk-ecj.orig/jdk/make/sun/awt/Makefile 2010-08-03 23:52:42.084667732 +0100 +++ openjdk-ecj/jdk/make/sun/awt/Makefile 2010-08-03 23:53:10.308917593 +0100 @@ -34,6 +34,8 @@ VIS_NEEDED=true include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 # # Use highest optimization level diff -Nru openjdk-ecj.orig/jdk/make/sun/xawt/Makefile openjdk-ecj/jdk/make/sun/xawt/Makefile --- openjdk-ecj.orig/jdk/make/sun/xawt/Makefile 2010-08-03 23:52:56.420668143 +0100 +++ openjdk-ecj/jdk/make/sun/xawt/Makefile 2010-08-03 23:53:18.494167931 +0100 @@ -31,6 +31,8 @@ PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 GEN_DIR=$(GENSRCDIR)/sun/awt/X11 diff -Nru openjdk-ecj.orig/jdk/make/javax/sound/Makefile openjdk-ecj/jdk/make/javax/sound/Makefile --- openjdk-ecj.orig/jdk/make/javax/sound/Makefile 2013-06-24 00:00:22.031254425 +0100 +++ openjdk-ecj/jdk/make/javax/sound/Makefile 2013-06-24 00:01:27.040288124 +0100 @@ -28,6 +28,8 @@ LIBRARY = jsound PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 # include defines for sound include SoundDefs.gmk diff -Nru openjdk-ecj.orig/jdk/make/javax/management/Makefile openjdk-ecj/jdk/make/javax/management/Makefile --- openjdk-ecj.orig/jdk/make/javax/management/Makefile 2011-11-14 22:11:40.000000000 +0000 +++ openjdk-ecj/jdk/make/javax/management/Makefile 2013-06-24 00:40:59.742001431 +0100 @@ -31,6 +31,8 @@ PACKAGE = javax.management PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 # # Files to compile diff --git a/make/java/awt/Makefile b/make/java/awt/Makefile --- openjdk-ecj/jdk/make/java/awt/Makefile +++ openjdk-ecj/jdk/make/java/awt/Makefile @@ -27,6 +27,8 @@ PACKAGE = java.awt PRODUCT = sun include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 # diff -ruN openjdk-ecj.orig/jdk/make/java/java/Makefile openjdk-ecj/jdk/make/java/java/Makefile --- openjdk-ecj.orig/jdk/make/java/java/Makefile 2012-10-26 14:25:40.000000000 -0400 +++ openjdk-ecj/jdk/make/java/java/Makefile 2013-07-09 15:46:52.421633685 -0400 @@ -33,6 +33,8 @@ LIBRARY = java PRODUCT = java include $(BUILDDIR)/common/Defs.gmk +LANGUAGE_VERSION = -source 6 +CLASS_VERSION = -target 6 # windows compiler flags ifeq ($(PLATFORM),windows)