diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2010-04-10 21:17:30 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2010-04-10 21:17:30 +0000 |
| commit | 9f5b755f1c7a6c4dfc20398fa23312045d10ad20 (patch) | |
| tree | 3cd0afc4cabd92e9b60d1bd4aed12fef145f9054 /www-servers | |
| parent | Pin Qt version to 4.5 for 0.9.0, as per bug #313059. Adding snapshot ebuild, ... (diff) | |
| download | gentoo-2-9f5b755f1c7a6c4dfc20398fa23312045d10ad20.tar.gz gentoo-2-9f5b755f1c7a6c4dfc20398fa23312045d10ad20.tar.bz2 gentoo-2-9f5b755f1c7a6c4dfc20398fa23312045d10ad20.zip | |
Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug #312293.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-servers')
| -rw-r--r-- | www-servers/tomcat/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/tomcat/tomcat-6.0.26.ebuild | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog index 738ae33109ed..a442681aa6c1 100644 --- a/www-servers/tomcat/ChangeLog +++ b/www-servers/tomcat/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/tomcat # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.228 2010/03/29 21:40:34 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.229 2010/04/10 21:17:30 caster Exp $ + + 10 Apr 2010; Vlastimil Babka <caster@gentoo.org> tomcat-6.0.26.ebuild: + Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug + #312293. 29 Mar 2010; Markus Meier <maekke@gentoo.org> tomcat-6.0.26.ebuild: amd64 stable, bug #303719 diff --git a/www-servers/tomcat/tomcat-6.0.26.ebuild b/www-servers/tomcat/tomcat-6.0.26.ebuild index 89996d252493..536b6117fc70 100644 --- a/www-servers/tomcat/tomcat-6.0.26.ebuild +++ b/www-servers/tomcat/tomcat-6.0.26.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/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.5 2010/03/29 21:40:34 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.6 2010/04/10 21:17:30 caster Exp $ EAPI=2 JAVA_PKG_IUSE="doc examples source test" @@ -66,8 +66,8 @@ pkg_setup() { java_prepare() { rm -v webapps/examples/WEB-INF/lib/*.jar || die - # bug # 178980 - if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then + # bug # 178980 and #312293 + if use amd64; then java-pkg_force-compiler ecj-3.3 fi |