/hg/icedtea: Double CACAO's heap (to 256MB) so that the langtool...

[andrew at icedtea.classpath.org]

changeset 37170bd13e08 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=37170bd13e08
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jun 22 16:00:26 2010 +0100

	Double CACAO's heap (to 256MB) so that the langtools build doesn't
	run out of memory.

	2010-06-21 Andrew John Hughes <ahughes at redhat.com>

	 * patches/cacao/memory.patch: Increase the memory
	used in the langtools build when using CACAO.
		* Makefile.am: Apply above patch when building with CACAO.


diffstat:

3 files changed, 20 insertions(+), 1 deletion(-)
ChangeLog                  |    8 ++++++++
Makefile.am                |    3 ++-
patches/cacao/memory.patch |   10 ++++++++++

diffs (42 lines):

diff -r c829a9d16fa0 -r 37170bd13e08 ChangeLog
--- a/ChangeLog	Mon Jun 21 21:38:43 2010 +0100
+++ b/ChangeLog	Tue Jun 22 16:00:26 2010 +0100
@@ -1,3 +1,11 @@ 2010-06-21 Andrew John Hughes  <ahughes@
+2010-06-21 Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/cacao/memory.patch:
+	Increase the memory used in the langtools
+	build when using CACAO.
+	* Makefile.am: Apply above patch when
+	building with CACAO.
+
 2010-06-21 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/cacao/native-resolve.patch,
diff -r c829a9d16fa0 -r 37170bd13e08 Makefile.am
--- a/Makefile.am	Mon Jun 21 21:38:43 2010 +0100
+++ b/Makefile.am	Tue Jun 22 16:00:26 2010 +0100
@@ -342,7 +342,8 @@ ICEDTEA_PATCHES += \
 	patches/cacao/version.patch \
 	patches/cacao/arm-arch-defines.patch \
 	patches/cacao/jsig.patch \
-	patches/cacao/6714758.patch
+	patches/cacao/6714758.patch \
+	patches/cacao/memory.patch
 endif
 
 if WITH_CACAO
diff -r c829a9d16fa0 -r 37170bd13e08 patches/cacao/memory.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/cacao/memory.patch	Tue Jun 22 16:00:26 2010 +0100
@@ -0,0 +1,10 @@
+--- openjdk.orig/langtools/make/build.xml	2010-06-01 11:25:40.145287816 +0100
++++ openjdk/langtools/make/build.xml	2010-06-21 21:48:41.000000000 +0100
+@@ -554,6 +554,7 @@
+                     <compilerarg value="-implicit:none"/>
+                     <compilerarg value="-Xprefer:source"/>
+                     <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
++		     <compilerarg value="-J-Xmx256M"/>
+                     <compilerarg line="@{bootclasspath.opt}"/>
+                     <compilerarg line="${javac.no.jdk.warnings}"/>
+                     <compilerarg line="${javac.version.opt}"/>