diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2013-01-27 19:57:08 +0000 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2013-01-27 19:57:08 +0000 |
| commit | f37b484a1c1ee89d2a23460082015ac212cae73e (patch) | |
| tree | 10a012d68e3d6f8ce0512f08189e1879483bdf9c /dev-libs/libffi | |
| parent | Convert to EAPI=4 and enable filecap support. (diff) | |
| download | gentoo-2-f37b484a1c1ee89d2a23460082015ac212cae73e.tar.gz gentoo-2-f37b484a1c1ee89d2a23460082015ac212cae73e.tar.bz2 gentoo-2-f37b484a1c1ee89d2a23460082015ac212cae73e.zip | |
Unbreak Prefix bootstraps with host-provided libffi
(Portage version: 2.2.01.21580-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Diffstat (limited to 'dev-libs/libffi')
| -rw-r--r-- | dev-libs/libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-3.0.11.ebuild | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog index 01312a9bb2a5..d3cda9a4ff3f 100644 --- a/dev-libs/libffi/ChangeLog +++ b/dev-libs/libffi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libffi # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.158 2013/01/13 04:52:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.159 2013/01/27 19:57:08 grobian Exp $ + + 27 Jan 2013; Fabian Groffen <grobian@gentoo.org> libffi-3.0.11.ebuild: + Unbreak Prefix bootstraps with host-provided libffi 13 Jan 2013; Mike Frysinger <vapier@gentoo.org> +files/libffi-3.0.11-x86-pic-check.patch, libffi-3.0.11.ebuild: diff --git a/dev-libs/libffi/libffi-3.0.11.ebuild b/dev-libs/libffi/libffi-3.0.11.ebuild index 73e42c93bc18..654e6eaa12d9 100644 --- a/dev-libs/libffi/libffi-3.0.11.ebuild +++ b/dev-libs/libffi/libffi-3.0.11.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.18 2013/01/13 04:52:11 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.0.11.ebuild,v 1.19 2013/01/27 19:57:08 grobian Exp $ EAPI=4 @@ -26,7 +26,7 @@ DOCS="ChangeLog* README" pkg_setup() { # Check for orphaned libffi, see http://bugs.gentoo.org/354903 for example - if [[ ${ROOT} == "/" ]] && ! has_version ${CATEGORY}/${PN}; then + if [[ ${ROOT} == "/" && ${EPREFIX} == "" ]] && ! has_version ${CATEGORY}/${PN}; then local base="${T}"/conftest echo 'int main() { }' > "${base}".c $(tc-getCC) -o "${base}" "${base}".c -lffi >&/dev/null |