| 1 |
ssuominen 09/06/04 07:07:28 |
| 2 |
|
| 3 |
Modified: jamvm-1.5.0-r3.ebuild |
| 4 |
Log: |
| 5 |
Missed the logic in -r2, it seems amd64 always needs libffi. |
| 6 |
(Portage version: 2.1.6.13/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.4 dev-java/jamvm/jamvm-1.5.0-r3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r3.ebuild?rev=1.4&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r3.ebuild?rev=1.4&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r3.ebuild?r1=1.3&r2=1.4 |
| 14 |
|
| 15 |
Index: jamvm-1.5.0-r3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r3.ebuild,v |
| 18 |
retrieving revision 1.3 |
| 19 |
retrieving revision 1.4 |
| 20 |
diff -u -r1.3 -r1.4 |
| 21 |
--- jamvm-1.5.0-r3.ebuild 4 Jun 2009 07:03:49 -0000 1.3 |
| 22 |
+++ jamvm-1.5.0-r3.ebuild 4 Jun 2009 07:07:28 -0000 1.4 |
| 23 |
@@ -1,6 +1,6 @@ |
| 24 |
# Copyright 1999-2009 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r3.ebuild,v 1.3 2009/06/04 07:03:49 ssuominen Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r3.ebuild,v 1.4 2009/06/04 07:07:28 ssuominen Exp $ |
| 28 |
|
| 29 |
EAPI=2 |
| 30 |
|
| 31 |
@@ -17,7 +17,8 @@ |
| 32 |
|
| 33 |
CLASSPATH_SLOT=0.97 |
| 34 |
RDEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT} |
| 35 |
- libffi? ( virtual/libffi )" |
| 36 |
+ libffi? ( virtual/libffi ) |
| 37 |
+ amd64? ( virtual/libffi )" |
| 38 |
DEPEND="${RDEPEND} |
| 39 |
dev-util/pkgconfig" |
| 40 |
PDEPEND="dev-java/ant-eclipse-ecj:3.3 |
| 41 |
@@ -38,12 +39,19 @@ |
| 42 |
CLASSPATH_DIR=/opt/gnu-classpath-${CLASSPATH_SLOT} |
| 43 |
|
| 44 |
src_configure() { |
| 45 |
+ local myconf |
| 46 |
+ |
| 47 |
filter-flags "-fomit-frame-pointer" |
| 48 |
|
| 49 |
if use libffi; then |
| 50 |
append-cflags "$(pkg-config --cflags-only-I libffi)" |
| 51 |
fi |
| 52 |
|
| 53 |
+ if use amd64; then |
| 54 |
+ append-cflags "$(pkg-config --cflags-only-I libffi)" |
| 55 |
+ myconf="--enable-ffi" |
| 56 |
+ fi |
| 57 |
+ |
| 58 |
# Keep libjvm.so out of /usr |
| 59 |
# http://bugs.gentoo.org/show_bug.cgi?id=181896 |
| 60 |
econf \ |
| 61 |
@@ -53,7 +61,8 @@ |
| 62 |
--datadir=/opt \ |
| 63 |
$(use_enable libffi ffi) \ |
| 64 |
--disable-dependency-tracking \ |
| 65 |
- --with-classpath-install-dir=${CLASSPATH_DIR} |
| 66 |
+ --with-classpath-install-dir=${CLASSPATH_DIR} \ |
| 67 |
+ ${myconf} |
| 68 |
} |
| 69 |
|
| 70 |
create_launcher() { |
Archives