| 1 |
betelgeuse 08/04/30 10:51:48 |
| 2 |
|
| 3 |
Modified: ChangeLog gnu-classpath-0.97-r1.ebuild |
| 4 |
Log: |
| 5 |
Add support for using ecj instead of virtual/jdk-1.6 |
| 6 |
(Portage version: 2.1.5_rc6) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.79 dev-java/gnu-classpath/ChangeLog |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gnu-classpath/ChangeLog?rev=1.79&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gnu-classpath/ChangeLog?rev=1.79&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gnu-classpath/ChangeLog?r1=1.78&r2=1.79 |
| 14 |
|
| 15 |
Index: ChangeLog |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v |
| 18 |
retrieving revision 1.78 |
| 19 |
retrieving revision 1.79 |
| 20 |
diff -u -r1.78 -r1.79 |
| 21 |
--- ChangeLog 10 Apr 2008 19:42:19 -0000 1.78 |
| 22 |
+++ ChangeLog 30 Apr 2008 10:51:48 -0000 1.79 |
| 23 |
@@ -1,6 +1,10 @@ |
| 24 |
# ChangeLog for dev-java/gnu-classpath |
| 25 |
# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.78 2008/04/10 19:42:19 betelgeuse Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/ChangeLog,v 1.79 2008/04/30 10:51:48 betelgeuse Exp $ |
| 28 |
+ |
| 29 |
+ 30 Apr 2008; Petteri Räty <betelgeuse@g.o> |
| 30 |
+ gnu-classpath-0.97-r1.ebuild: |
| 31 |
+ Add support for using ecj instead of virtual/jdk-1.6 |
| 32 |
|
| 33 |
09 Apr 2008; Markus Meier <maekke@g.o> |
| 34 |
gnu-classpath-0.97-r1.ebuild: |
| 35 |
|
| 36 |
|
| 37 |
|
| 38 |
1.5 dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild |
| 39 |
|
| 40 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild?rev=1.5&view=markup |
| 41 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild?rev=1.5&content-type=text/plain |
| 42 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild?r1=1.4&r2=1.5 |
| 43 |
|
| 44 |
Index: gnu-classpath-0.97-r1.ebuild |
| 45 |
=================================================================== |
| 46 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v |
| 47 |
retrieving revision 1.4 |
| 48 |
retrieving revision 1.5 |
| 49 |
diff -u -r1.4 -r1.5 |
| 50 |
--- gnu-classpath-0.97-r1.ebuild 10 Apr 2008 19:42:19 -0000 1.4 |
| 51 |
+++ gnu-classpath-0.97-r1.ebuild 30 Apr 2008 10:51:48 -0000 1.5 |
| 52 |
@@ -1,6 +1,6 @@ |
| 53 |
# Copyright 1999-2008 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.4 2008/04/10 19:42:19 betelgeuse Exp $ |
| 56 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/gnu-classpath/gnu-classpath-0.97-r1.ebuild,v 1.5 2008/04/30 10:51:48 betelgeuse Exp $ |
| 57 |
|
| 58 |
EAPI=1 |
| 59 |
|
| 60 |
@@ -57,7 +57,10 @@ |
| 61 |
sys-apps/file" |
| 62 |
|
| 63 |
DEPEND="app-arch/zip |
| 64 |
- >=virtual/jdk-1.6.0 |
| 65 |
+ || ( |
| 66 |
+ dev-java/eclipse-ecj:3.3 |
| 67 |
+ >=virtual/jdk-1.6.0 |
| 68 |
+ ) |
| 69 |
gtk? ( |
| 70 |
x11-proto/xextproto |
| 71 |
x11-proto/xproto |
| 72 |
@@ -66,6 +69,15 @@ |
| 73 |
|
| 74 |
S=${WORKDIR}/${MY_P} |
| 75 |
|
| 76 |
+pkg_setup() { |
| 77 |
+ has_version dev-java/eclipse-ecj:3.3 && export HAVE_ECJ=true |
| 78 |
+ if [[ ${HAVE_ECJ} ]]; then |
| 79 |
+ export JAVAC="/usr/bin/ecj-3.3 -nowarn" |
| 80 |
+ else |
| 81 |
+ java-pkg-2_pkg_setup |
| 82 |
+ fi |
| 83 |
+} |
| 84 |
+ |
| 85 |
src_compile() { |
| 86 |
# Upstreams sets proper -source and -target |
| 87 |
unset JAVACFLAGS |
| 88 |
@@ -80,6 +92,9 @@ |
| 89 |
# die "Unusable JDK + compiler combination" |
| 90 |
#fi |
| 91 |
|
| 92 |
+ if [[ ${HAVE_ECJ} ]]; then |
| 93 |
+ local myconf="--with-ecj-jar=$(java-pkg_getjars --build-only eclipse-ecj-3.3)" |
| 94 |
+ fi |
| 95 |
# don't use econf, because it ends up putting things under /usr, which may |
| 96 |
# collide with other slots of classpath |
| 97 |
./configure ${compiler} \ |
| 98 |
|
| 99 |
|
| 100 |
|
| 101 |
-- |
| 102 |
gentoo-commits@l.g.o mailing list |
Archives