summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Thomson <wltjr@gentoo.org>2007-05-28 23:32:54 +0000
committerWilliam Thomson <wltjr@gentoo.org>2007-05-28 23:32:54 +0000
commitc3b2e9d0bd3fcaed22db5d6e0bf8135c48e680af (patch)
tree0fe939635e08d4af2f3e42ee5ff3569636396a87 /www-servers
parentVersion bumped. (diff)
downloadgentoo-2-c3b2e9d0bd3fcaed22db5d6e0bf8135c48e680af.tar.gz
gentoo-2-c3b2e9d0bd3fcaed22db5d6e0bf8135c48e680af.tar.bz2
gentoo-2-c3b2e9d0bd3fcaed22db5d6e0bf8135c48e680af.zip
Added arch & jdk detection to determine if compiler needs to be switched. Alternative to increasing mem via -Xmx. Fix for bug # 178980
(Portage version: 2.1.2.7)
Diffstat (limited to 'www-servers')
-rw-r--r--www-servers/tomcat/ChangeLog7
-rw-r--r--www-servers/tomcat/tomcat-6.0.13-r1.ebuild7
2 files changed, 12 insertions, 2 deletions
diff --git a/www-servers/tomcat/ChangeLog b/www-servers/tomcat/ChangeLog
index bef0fd6ca589..de1c8f73f063 100644
--- a/www-servers/tomcat/ChangeLog
+++ b/www-servers/tomcat/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for www-servers/tomcat
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.145 2007/05/25 14:29:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.146 2007/05/28 23:32:54 wltjr Exp $
+
+ 28 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+ tomcat-6.0.13-r1.ebuild:
+ Added arch & jdk detection to determine if compiler needs to be switched.
+ Alternative to increasing mem via -Xmx. Fix for bug # 178980
25 May 2007; William L. Thomson Jr. <wltjr@gentoo.org>
tomcat-6.0.13-r1.ebuild:
diff --git a/www-servers/tomcat/tomcat-6.0.13-r1.ebuild b/www-servers/tomcat/tomcat-6.0.13-r1.ebuild
index 35480e6fc08c..ed8839aba9e7 100644
--- a/www-servers/tomcat/tomcat-6.0.13-r1.ebuild
+++ b/www-servers/tomcat/tomcat-6.0.13-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13-r1.ebuild,v 1.2 2007/05/25 14:29:08 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.13-r1.ebuild,v 1.3 2007/05/28 23:32:54 wltjr Exp $
WANT_ANT_TASKS="ant-trax"
@@ -56,6 +56,11 @@ src_unpack() {
}
src_compile(){
+ # Fix for bug # 178980
+ if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then
+ java-pkg_force-compiler ecj-3.2
+ fi
+
local antflags="build-jasper-jdt deploy -Dbase.path=${T}"
antflags="${antflags} -Dcompile.debug=false"
if ! use doc; then