view patches/boot/compile-for-7-cacao-mem.patch @ 2794:95e61307e07c

PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO 2015-07-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * AUTHORS: Add James. * NEWS: Updated. 2015-05-23 James Le Cuirot <chewi@gentoo.org> PR2380: Raise javadoc and JAVAC_FLAGS memory limits for CACAO * patches/boot/compile-for-7-cacao-mem.patch: Increase memory limits so a build with CACAO and doc generation succeeds. * patches/cacao/memory.patch: Likewise.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 16 Jul 2015 00:38:16 +0100
parents df0999b55509
children
line wrap: on
line source

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-Xmx512m
 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-Xmx512m
 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-Xmx512m
 BOOTSTRAP_JAVAC_FLAGS=$(JAVAC_FLAGS) -source $(BOOT_SOURCE_LANGUAGE_VERSION) -target $(BOOT_TARGET_CLASS_VERSION)