diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2009-06-04 07:07:28 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-04 07:07:28 +0000 |
| commit | dc2091ab918caa695302ef3ed3878aa02282294e (patch) | |
| tree | 272e408f3f084ee82e6fe12b6a26d0d14c2dd7b0 /dev-java/jamvm | |
| parent | Make it so it doesn't end up in RDEPEND. (diff) | |
| download | gentoo-2-dc2091ab918caa695302ef3ed3878aa02282294e.tar.gz gentoo-2-dc2091ab918caa695302ef3ed3878aa02282294e.tar.bz2 gentoo-2-dc2091ab918caa695302ef3ed3878aa02282294e.zip | |
Missed the logic in -r2, it seems amd64 always needs libffi.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jamvm')
| -rw-r--r-- | dev-java/jamvm/jamvm-1.5.0-r3.ebuild | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/dev-java/jamvm/jamvm-1.5.0-r3.ebuild b/dev-java/jamvm/jamvm-1.5.0-r3.ebuild index 2c95ab4faaf7..fdb99df8d738 100644 --- a/dev-java/jamvm/jamvm-1.5.0-r3.ebuild +++ b/dev-java/jamvm/jamvm-1.5.0-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $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 $ +# $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 $ EAPI=2 @@ -17,7 +17,8 @@ IUSE="debug libffi" CLASSPATH_SLOT=0.97 RDEPEND="dev-java/gnu-classpath:${CLASSPATH_SLOT} - libffi? ( virtual/libffi )" + libffi? ( virtual/libffi ) + amd64? ( virtual/libffi )" DEPEND="${RDEPEND} dev-util/pkgconfig" PDEPEND="dev-java/ant-eclipse-ecj:3.3 @@ -38,12 +39,19 @@ src_prepare() { CLASSPATH_DIR=/opt/gnu-classpath-${CLASSPATH_SLOT} src_configure() { + local myconf + filter-flags "-fomit-frame-pointer" if use libffi; then append-cflags "$(pkg-config --cflags-only-I libffi)" fi + if use amd64; then + append-cflags "$(pkg-config --cflags-only-I libffi)" + myconf="--enable-ffi" + fi + # Keep libjvm.so out of /usr # http://bugs.gentoo.org/show_bug.cgi?id=181896 econf \ @@ -53,7 +61,8 @@ src_configure() { --datadir=/opt \ $(use_enable libffi ffi) \ --disable-dependency-tracking \ - --with-classpath-install-dir=${CLASSPATH_DIR} + --with-classpath-install-dir=${CLASSPATH_DIR} \ + ${myconf} } create_launcher() { |