Mercurial > hg > release > icedtea7-2.3

changeset 2559:df0999b55509

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make compile-for-7.patch apply after cacao/memory.patch 2012-06-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: Apply compile-for-7-cacao-mem.patch instead of compile-for-7.patch when using a compiler that supports diamond and either USING_CACAO or BUILD_CACAO are set. * patches/boot/compile-for-7-cacao-mem.patch: Version of compile-for-7.patch post applying cacao/memory.patch.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 13 Jun 2012 12:49:37 +0100
parents e6d81fc2c943
children b174e5813594
files ChangeLog Makefile.am patches/boot/compile-for-7-cacao-mem.patch
diffstat 3 files changed, 61 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 13 00:01:00 2012 +0100
+++ b/ChangeLog	Wed Jun 13 12:49:37 2012 +0100
@@ -1,3 +1,14 @@
+2012-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	Apply compile-for-7-cacao-mem.patch instead of
+	compile-for-7.patch when using a compiler that
+	supports diamond and either USING_CACAO or BUILD_CACAO
+	are set.
+	* patches/boot/compile-for-7-cacao-mem.patch:
+	Version of compile-for-7.patch post applying
+	cacao/memory.patch.
+
 2012-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR986
--- a/Makefile.am	Wed Jun 13 00:01:00 2012 +0100
+++ b/Makefile.am	Wed Jun 13 12:49:37 2012 +0100
@@ -364,8 +364,16 @@
 if JAVAC_LACKS_DIAMOND
 ICEDTEA_BOOT_PATCHES += patches/boot/ecj-diamond.patch
 else
+if USING_CACAO
+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
+else
+if BUILD_CACAO
+ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7-cacao-mem.patch
+else
 ICEDTEA_BOOT_PATCHES += patches/boot/compile-for-7.patch
 endif
+endif
+endif
 
 if DTDTYPE_QNAME
 ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/boot/compile-for-7-cacao-mem.patch	Wed Jun 13 12:49:37 2012 +0100
@@ -0,0 +1,42 @@
+diff -Nru openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make openjdk-boot/hotspot/make/linux/makefiles/rules.make
+--- openjdk-boot.orig/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
++++ openjdk-boot/hotspot/make/linux/makefiles/rules.make	2012-06-13 03:48:41.838257784 +0100
+@@ -139,8 +139,8 @@
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+ 
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION = 6
+-BOOT_TARGET_CLASS_VERSION = 6
++BOOT_SOURCE_LANGUAGE_VERSION = 7
++BOOT_TARGET_CLASS_VERSION = 7
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+diff -Nru openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make openjdk-boot/hotspot/make/solaris/makefiles/rules.make
+--- openjdk-boot.orig/hotspot/make/solaris/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
++++ openjdk-boot/hotspot/make/solaris/makefiles/rules.make	2012-06-13 11:36:03.057522188 +0100
+@@ -131,8 +131,8 @@
+ RUN.JAR$(MAKE_VERBOSE) += >/dev/null
+ 
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION = 6
+-BOOT_TARGET_CLASS_VERSION = 6
++BOOT_SOURCE_LANGUAGE_VERSION = 7
++BOOT_TARGET_CLASS_VERSION = 7
+ JAVAC_FLAGS = -g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS = $(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+ 
+diff -Nru openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make openjdk-boot/hotspot/make/windows/makefiles/rules.make
+--- openjdk-boot.orig/hotspot/make/windows/makefiles/rules.make	2012-06-13 03:40:41.009311243 +0100
++++ openjdk-boot/hotspot/make/windows/makefiles/rules.make	2012-06-13 11:36:19.537797380 +0100
+@@ -43,8 +43,8 @@
+ !endif
+ 
+ # Settings for javac
+-BOOT_SOURCE_LANGUAGE_VERSION=6
+-BOOT_TARGET_CLASS_VERSION=6
++BOOT_SOURCE_LANGUAGE_VERSION=7
++BOOT_TARGET_CLASS_VERSION=7
+ JAVAC_FLAGS=-g -encoding ascii -J-Xmx256m
+ BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)
+