1 |
caster 10/04/10 21:17:30 |
2 |
|
3 |
Modified: ChangeLog tomcat-6.0.26.ebuild |
4 |
Log: |
5 |
Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug #312293. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.229 www-servers/tomcat/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.229&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?rev=1.229&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/ChangeLog?r1=1.228&r2=1.229 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v |
18 |
retrieving revision 1.228 |
19 |
retrieving revision 1.229 |
20 |
diff -u -r1.228 -r1.229 |
21 |
--- ChangeLog 29 Mar 2010 21:40:34 -0000 1.228 |
22 |
+++ ChangeLog 10 Apr 2010 21:17:30 -0000 1.229 |
23 |
@@ -1,6 +1,10 @@ |
24 |
# ChangeLog for www-servers/tomcat |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.228 2010/03/29 21:40:34 maekke Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/ChangeLog,v 1.229 2010/04/10 21:17:30 caster Exp $ |
28 |
+ |
29 |
+ 10 Apr 2010; Vlastimil Babka <caster@g.o> tomcat-6.0.26.ebuild: |
30 |
+ Always use ecj to compile on amd64 to prevent insufficient heap, fixes bug |
31 |
+ #312293. |
32 |
|
33 |
29 Mar 2010; Markus Meier <maekke@g.o> tomcat-6.0.26.ebuild: |
34 |
amd64 stable, bug #303719 |
35 |
|
36 |
|
37 |
|
38 |
1.6 www-servers/tomcat/tomcat-6.0.26.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.6&view=markup |
41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?rev=1.6&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild?r1=1.5&r2=1.6 |
43 |
|
44 |
Index: tomcat-6.0.26.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v |
47 |
retrieving revision 1.5 |
48 |
retrieving revision 1.6 |
49 |
diff -u -r1.5 -r1.6 |
50 |
--- tomcat-6.0.26.ebuild 29 Mar 2010 21:40:34 -0000 1.5 |
51 |
+++ tomcat-6.0.26.ebuild 10 Apr 2010 21:17:30 -0000 1.6 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2010 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.5 2010/03/29 21:40:34 maekke Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/www-servers/tomcat/tomcat-6.0.26.ebuild,v 1.6 2010/04/10 21:17:30 caster Exp $ |
57 |
|
58 |
EAPI=2 |
59 |
JAVA_PKG_IUSE="doc examples source test" |
60 |
@@ -66,8 +66,8 @@ |
61 |
java_prepare() { |
62 |
rm -v webapps/examples/WEB-INF/lib/*.jar || die |
63 |
|
64 |
- # bug # 178980 |
65 |
- if use amd64 && [[ "${GENTOO_VM}" = "sun-jdk-1.5" ]] ; then |
66 |
+ # bug # 178980 and #312293 |
67 |
+ if use amd64; then |
68 |
java-pkg_force-compiler ecj-3.3 |
69 |
fi |