diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2008-03-20 13:41:12 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2008-03-20 13:41:12 +0000 |
| commit | 2415a255f0fae746ee0f315452f3e29461c988c1 (patch) | |
| tree | c655741bcb41ed134f9d4f76f5a9594875173cf5 /dev-java | |
| parent | package.use.mask libffi on amd64 as libffi is always required. See bug #213882. (diff) | |
| download | gentoo-2-2415a255f0fae746ee0f315452f3e29461c988c1.tar.gz gentoo-2-2415a255f0fae746ee0f315452f3e29461c988c1.tar.bz2 gentoo-2-2415a255f0fae746ee0f315452f3e29461c988c1.zip | |
Always needs libffi support on amd64. Fixes bug #213882.
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/jamvm/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jamvm/jamvm-1.5.0-r2.ebuild | 16 |
2 files changed, 16 insertions, 5 deletions
diff --git a/dev-java/jamvm/ChangeLog b/dev-java/jamvm/ChangeLog index 13a0416b4274..8597f509a7e2 100644 --- a/dev-java/jamvm/ChangeLog +++ b/dev-java/jamvm/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/jamvm # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.29 2008/03/04 22:46:03 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/ChangeLog,v 1.30 2008/03/20 13:41:12 betelgeuse Exp $ + + 20 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> jamvm-1.5.0-r2.ebuild: + Always needs libffi support on amd64. Fixes bug #213882. *jamvm-1.5.0-r2 (04 Mar 2008) diff --git a/dev-java/jamvm/jamvm-1.5.0-r2.ebuild b/dev-java/jamvm/jamvm-1.5.0-r2.ebuild index 162106173f05..47ca305deba3 100644 --- a/dev-java/jamvm/jamvm-1.5.0-r2.ebuild +++ b/dev-java/jamvm/jamvm-1.5.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 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-r2.ebuild,v 1.1 2008/03/04 22:46:03 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jamvm/jamvm-1.5.0-r2.ebuild,v 1.2 2008/03/20 13:41:12 betelgeuse Exp $ EAPI=1 @@ -25,7 +25,12 @@ pkg_setup() { eerror "sys-devel/gcc not built with libffi support" eerror "rebuild sys-devel/gcc with USE=\"libffi\" or" eerror "turn off the libffi use flag on on ${PN}" - die "Rebuild sys-devel/gcc with libffi" + die "Rebuild sys-devel/gcc with libffi support" + fi + if use amd64 && ! built_with_use sys-devel/gcc libffi; then + eerror "sys-devel/gcc not built with libffi support" + eerror "rebuild sys-devel/gcc with USE=\"libffi\"" + die "Rebuild sys-devel/gcc with libffi support" fi java-vm-2_pkg_setup } @@ -49,15 +54,18 @@ CLASSPATH_DIR=/opt/gnu-classpath-${CLASSPATH_SLOT} src_compile() { filter-flags "-fomit-frame-pointer" + local conf="--enable-ffi" + use !amd64 && conf="$(use_enable libffi ffi)" + # Keep libjvm.so out of /usr # http://bugs.gentoo.org/show_bug.cgi?id=181896 - econf \ + econf ${conf} \ $(use_enable debug trace) \ - $(use_enable libffi ffi) \ --prefix=/opt/${PN} \ --datadir=/opt/ \ --bindir=/usr/bin \ --with-classpath-install-dir=${CLASSPATH_DIR} \ + $(use amd64 && echo --enable-ffi) \ || die "configure failed." emake || die "make failed." } |