Fix bug #225921 (not enough heap space with ecj compiler) for 0.97 as well.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 26 insertions, 8 deletions

diff --git a/dev-java/gnu-classpath/ChangeLog b/dev-java/gnu-classpath/ChangeLog
index ac292766b5ea..578cb4d34d35 100644
--- a/dev-java/gnu-classpath/ChangeLog
+++ b/dev-java/gnu-classpath/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/gnu-classpath
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.105 2010/03/21 22:36:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.106 2010/03/21 22:41:37 caster Exp $
+
+  21 Mar 2010; Vlastimil Babka <caster@gentoo.org>
+  gnu-classpath-0.97-r1.ebuild, gnu-classpath-0.97.2.ebuild,
+  gnu-classpath-0.97.2-r1.ebuild:
+  Fix bug #225921 (not enough heap space with ecj compiler) for 0.97 as
+  well.
 
 *gnu-classpath-0.97.2-r1 (21 Mar 2010)
 
diff --git a/dev-java/gnu-classpath/Manifest b/dev-java/gnu-classpath/Manifest
index 43e86428cc77..eb303c0f0c84 100644
--- a/dev-java/gnu-classpath/Manifest
+++ b/dev-java/gnu-classpath/Manifest
@@ -2,10 +2,10 @@ AUX 0.93-nsplugin.patch 1518 RMD160 b82f191cd788dce09745ca17042499f278d0b695 SHA
 DIST classpath-0.97-gentoo.tar.gz 10261662 RMD160 01ef33c4e50b5c88bfe2f59d9249110072d3764e SHA1 22b2ac2444b73df841e07c36c4e6621ab9a06d3f SHA256 5f0619b26fe3e0cded3e76a09be4004db62f5bcd198c041da2bd619cc633200e
 DIST classpath-0.97.2.tar.gz 10318014 RMD160 a33667d2b692da22cb872c57265511115a543a76 SHA1 627e9781f9bb744b1a70e4aaff88d2d0440cbf1f SHA256 001fee5ad3ddd043783d59593153510f09064b0d9b5aea82f535266f62f02db4
 DIST classpath-0.98.tar.gz 11021342 RMD160 9a20f4ca9379d90cbca644c0e9410df1c57575a5 SHA1 1d6e8d1b3542a35bbd1013c61fab3cfae083decb SHA256 501b5acd4dff79b6100da22cef15080f31071821ce3cea6f1b739bc1b56fac3f
-EBUILD gnu-classpath-0.97-r1.ebuild 3148 RMD160 1789e3c84bbe8690b1a568f14c0ff8b8a48cb7e9 SHA1 20b55a2e841bcf01e2bf1a17b7ee4d54840d911c SHA256 2435e875350a6b210e836a03100796a600a0ee03ee16cfdfe0ae07158afb0ebe
-EBUILD gnu-classpath-0.97.2-r1.ebuild 2398 RMD160 7f4da0328ebcf98f8578eb725910fb65508f90d4 SHA1 4225f4a943126934b0ebb9949d16d632cbdfb32c SHA256 20c41550b5f9fffc45ff7e71a62953fec2d0a0c268e8e1615c1663d0426175cc
-EBUILD gnu-classpath-0.97.2.ebuild 2288 RMD160 d4ad49c7bf6509ed636316b956024780dfbdd12b SHA1 e3c1a60e804b177af00c64e41e5ae36479c7eb93 SHA256 dad3618b5b86a2c0e0ff9e596c1d5f0ccc2c613cab4ea310eb2e1d6a54ee2875
+EBUILD gnu-classpath-0.97-r1.ebuild 3304 RMD160 90c364c6885dd19572357f34cb31d0c019f3be1d SHA1 4cde99a6e1c2e64eebf2a775b34c6a33365d1cbd SHA256 003a6927af8c1f25dd5d5d584d243cbe60129405171b8c89cef7a01588717546
+EBUILD gnu-classpath-0.97.2-r1.ebuild 2551 RMD160 830c3b90f91e5d3afef010f2df4af25260604f54 SHA1 c2d9dc8dda86b76c626a7354f829d667c3cc4924 SHA256 2329e93d2ba6afbab55eaa090f90627fd05d01f0221a183999c1db551feded53
+EBUILD gnu-classpath-0.97.2.ebuild 2441 RMD160 b008eba788b76762d5a149ee2d42948e5e256040 SHA1 8d157049a1c27001644cfb213011bbb9afa2ea02 SHA256 e9d867f072e99bd1adf14b1fec65e30e4de5afc4071af73333057a09637afb38
 EBUILD gnu-classpath-0.98-r1.ebuild 3196 RMD160 ad61b50943c1918cf1f41dca4d053b452378d1c3 SHA1 1f22fbe68f77e22341d3978de1c197f75512ba3c SHA256 50acc65a3ee097fdf8058a3a4afebe0dcae9a3cab43a3fb7aa1ad07037090932
 EBUILD gnu-classpath-0.98-r2.ebuild 3197 RMD160 50d8ba289072479c2dfb68f382bc6714995c8373 SHA1 f48a13d6c05802c6dbbfcf1a9a6e1062ae46522a SHA256 16e66d8a38ce6d1c3de85744a50d13ecbc0265c48535ab235fe8dc1aeae0b226
-MISC ChangeLog 15895 RMD160 688e24eaa35c406afed03c6cd4b2579d4bdaf09c SHA1 f66b6ee1c3af40249b8502ab278e8e052420a3ca SHA256 e2e56ddb1d0e94d7fe5265ad18857995b26a16fe5913b5000e7699b6862eff4c
+MISC ChangeLog 16122 RMD160 a05f7db657a2592177d2ba4d6b1da7855b066eba SHA1 9ae91a1a7d54832d7be6eccc64fef80df05d6e07 SHA256 f8e26362b97724cab31339393e693b0c71e2f4add45353c438a20bdea202a912
 MISC metadata.xml 759 RMD160 c3f604690ab9414b5d0c58fb74e1d85be10723be SHA1 1a83518e46e13aba75a83f0793e7db52b725867a SHA256 24e294a08d57473d495a67acdcc44c0f32747187531feeb72dfa678731cd51d2
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
index 2813ad235444..341b8c4278ec 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.12 2010/03/21 20:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.13 2010/03/21 22:41:37 caster Exp $
 
 EAPI=1
 
@@ -84,6 +84,10 @@ src_compile() {
 
 	if [[ ${HAVE_ECJ} ]]; then
 		local myconf="--with-ecj-jar=$(java-pkg_getjars --build-only eclipse-ecj-3.3)"
+
+		# build system is passing -J-Xmx768M which ecj however ignores
+		# this will make the ecj launcher do it (bug #225921)
+		export gjl_java_args="-Xmx768M"
 	fi
 	# don't use econf, because it ends up putting things under /usr, which may
 	# collide with other slots of classpath
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
index 1b275b9cf035..4eab084cb850 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild,v 1.1 2010/03/21 22:36:49 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2-r1.ebuild,v 1.2 2010/03/21 22:41:37 caster Exp $
 
 EAPI=1
 
@@ -60,6 +60,10 @@ S=${WORKDIR}/${MY_P}
 src_compile() {
 	export JAVAC="/usr/bin/ecj-3.5 -nowarn"
 
+	# build system is passing -J-Xmx768M which ecj however ignores
+	# this will make the ecj launcher do it (bug #225921)
+	export gjl_java_args="-Xmx768M"
+
 	# don't use econf, because it ends up putting things under /usr, which may
 	# collide with other slots of classpath
 	./configure \
diff --git a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
index f998f7a63c25..144994a9bd03 100644
--- a/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
+++ b/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.7 2010/03/21 20:50:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97.2.ebuild,v 1.8 2010/03/21 22:41:37 caster Exp $
 
 EAPI=1
 
@@ -56,6 +56,10 @@ S=${WORKDIR}/${MY_P}
 src_compile() {
 	export JAVAC="/usr/bin/ecj-3.3 -nowarn"
 
+	# build system is passing -J-Xmx768M which ecj however ignores
+	# this will make the ecj launcher do it (bug #225921)
+	export gjl_java_args="-Xmx768M"
+
 	# don't use econf, because it ends up putting things under /usr, which may
 	# collide with other slots of classpath
 	./configure \