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 | 2f84b04d3aa62ded91b359a8a6d000ca47c902b9 (patch) | |
| tree | 802b08831fe3afc34c2343fa30c5a9e08613dd61 /dev-java/jamvm | |
| parent | package.use.mask libffi on amd64 as libffi is always required. See bug #213882. (diff) | |
| download | historical-2f84b04d3aa62ded91b359a8a6d000ca47c902b9.tar.gz historical-2f84b04d3aa62ded91b359a8a6d000ca47c902b9.tar.bz2 historical-2f84b04d3aa62ded91b359a8a6d000ca47c902b9.zip | |
Always needs libffi support on amd64. Fixes bug #213882.
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'dev-java/jamvm')
| -rw-r--r-- | dev-java/jamvm/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/jamvm/Manifest | 10 | ||||
| -rw-r--r-- | dev-java/jamvm/jamvm-1.5.0-r2.ebuild | 16 |
3 files changed, 21 insertions, 10 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/Manifest b/dev-java/jamvm/Manifest index 7b08cda8e89b..f2d5e58b5588 100644 --- a/dev-java/jamvm/Manifest +++ b/dev-java/jamvm/Manifest @@ -10,14 +10,14 @@ DIST jamvm-1.5.0.tar.gz 594250 RMD160 cfe80de1e2895df177b054cc622df2ed8e51feb9 S EBUILD jamvm-1.4.2.ebuild 1058 RMD160 059f12a824e6177b53d903a65f2cfa56edb047d7 SHA1 91f8cf3b8075ca5109f97e826e30b187c532fc66 SHA256 39b323f11ed4fba94e2ef84a9525d4b7427d08150fd24fd920d85b80b91223b2 EBUILD jamvm-1.4.5.ebuild 1704 RMD160 dc069285bf6ac9f9b702112e1162da0dc737f4b2 SHA1 9d714a7aae8ff885bafaf8346dd87b772591151e SHA256 2eb8989fd573cdf5cb17d85354176a25b77ef42c58cd3de61572e970d5923d66 EBUILD jamvm-1.5.0-r1.ebuild 2099 RMD160 a22befbaf259894916defa663feabf555645aca6 SHA1 da7c446cd85a15e2ec246c9dc7750a817798dc37 SHA256 6b72fba069b6a25e1655b619b5d0834c2c5da2565023869f8ec77d8723e8c1b5 -EBUILD jamvm-1.5.0-r2.ebuild 2482 RMD160 29ac45e9d1902163e06004e77d8d547aca820deb SHA1 199c6f890972c22d13e78583ee9af18283a8216e SHA256 ed16cbc0d554813a9a54e044d7d0b56ffa42804ece4a4deb6a46a4f000695a9c +EBUILD jamvm-1.5.0-r2.ebuild 2805 RMD160 e9f61c9615329456b5b87e580ea92bb773281843 SHA1 62832949815dcfd3d2d3cbc226293253c259668b SHA256 f663765c741e4c23483f52444b5bbf2217679f26705a226324a3ade7bfd25686 EBUILD jamvm-1.5.0.ebuild 2092 RMD160 87e7fee86647838117c27be5abe0117be6244a74 SHA1 424f2df5958757c2154700804153c685167fe866 SHA256 4af564e50170d41f1508da1890b4353404eb723162ead18ac3470dcc6ed79d4f -MISC ChangeLog 4643 RMD160 d2df10c01f75b292c990a1e8b2aa3cafbc78c9ef SHA1 b088922e2deb6c17d63ae34029cc5a7b99e56642 SHA256 befa5872feb46b9c4bdee66f7029490b46fd52558c6e5addff832a748453b0b3 +MISC ChangeLog 4779 RMD160 643abc242853174f167704a97851034cfcb7f432 SHA1 a17679449194149a0579b9e2c46177525c20d314 SHA256 c175cda6dda775dfbefef09322a5325f861a7b92d4ee169ac9612ab9b34a60d0 MISC metadata.xml 159 RMD160 8da0afd0f687b8985b7f0432fec737950271e354 SHA1 1d089c3afbfafd09e371d7806cc0c72a5c76e5a1 SHA256 da2aaa3223c5418688dfbba6f899648c5bcb2e4610126519a1a862913c4f8fa6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.7 (GNU/Linux) -iD8DBQFHzdFAcxLzpIGCsLQRAh+FAJoCK95bnBLJbkNzLPpEUjvukmRt7ACglE7E -Vgk0srdu3sdlj8SZm2cA9BI= -=uwZw +iD8DBQFH4mmbcxLzpIGCsLQRAsolAJ9VrQ5r1eh3c2DdEnlH8qxbP/XFtQCdFC4Z +gbcKz/dXR/a5V9CW7nX+Wf8= +=8cK1 -----END PGP SIGNATURE----- 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." } |