diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2005-12-22 01:24:46 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2005-12-22 01:24:46 +0000 |
| commit | 15760138b21189b6b861bfa58c387c44b7fbddb0 (patch) | |
| tree | 7ffa47accd0c86f5d9617f764e7434725c79054c /dev-libs/libffi | |
| parent | new version to ~x86 (diff) | |
| download | gentoo-2-15760138b21189b6b861bfa58c387c44b7fbddb0.tar.gz gentoo-2-15760138b21189b6b861bfa58c387c44b7fbddb0.tar.bz2 gentoo-2-15760138b21189b6b861bfa58c387c44b7fbddb0.zip | |
Fixed multilib-strict violation (bug #74949).
(Portage version: 2.1_pre1)
Diffstat (limited to 'dev-libs/libffi')
| -rw-r--r-- | dev-libs/libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libffi/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-3.4.1.ebuild | 12 |
3 files changed, 11 insertions, 8 deletions
diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog index c8c350f289f1..c7c746c3d256 100644 --- a/dev-libs/libffi/ChangeLog +++ b/dev-libs/libffi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libffi # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.34 2005/12/21 13:35:47 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.35 2005/12/22 01:24:46 nichoj Exp $ + + 22 Dec 2005; Joshua Nichols <nichoj@gentoo.org> libffi-3.4.1.ebuild: + Fixed multilib-strict violation (bug #74949). 21 Dec 2005; Seemant Kulleen <seemant@gentoo.org> libffi-3.3.5.ebuild, libffi-3.4.1.ebuild, libffi-3.4.1-r1.ebuild, libffi-3.4.3.ebuild: diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index 04831efca83d..47c9c4699b04 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -9,6 +9,6 @@ MD5 1ca677e646f4d209e68601c9ba83c629 files/libffi-without-libgcj.dpatch 2255 MD5 ea5e2ecd7602d6f2fb898c3f25f6e353 libffi-1.20.ebuild 604 MD5 80bb0fc8fbb6690e139e43c20573c5a4 libffi-3.3.5.ebuild 6593 MD5 0bfe33cbee49cf9068c44632e0fe1133 libffi-3.4.1-r1.ebuild 5756 -MD5 1a22fbfb7f17a593f82b50f1d2d99349 libffi-3.4.1.ebuild 7000 +MD5 223f7c87490f50ead6312a58489f155d libffi-3.4.1.ebuild 7049 MD5 1b9d42065b42f423dc07cd24afa99385 libffi-3.4.3.ebuild 5705 MD5 ef1d6e99f954cc3412a9e513a2d80c64 metadata.xml 1836 diff --git a/dev-libs/libffi/libffi-3.4.1.ebuild b/dev-libs/libffi/libffi-3.4.1.ebuild index 34f16ed5106e..8a5c7b2772ca 100644 --- a/dev-libs/libffi/libffi-3.4.1.ebuild +++ b/dev-libs/libffi/libffi-3.4.1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.10 2005/12/21 13:35:47 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.11 2005/12/22 01:24:46 nichoj Exp $ IUSE="nls nptl" SLOT="0" -inherit eutils flag-o-matic libtool versionator +inherit eutils flag-o-matic libtool versionator multilib # This ebuild mod'd from libstdc++ compatbility package ebuild to create # a similar structure for libffi, which is also included in gcc sources. @@ -63,7 +63,7 @@ LOC="/usr" MY_PV="$(get_version_component_range 1-2)" MY_PV_FULL="$(get_version_component_range 1-3)" -LIBPATH="${LOC}/lib/gcc-lib/${CCHOST}/${MY_PV_FULL}" +LIBPATH="${LOC}/$(get_libdir)/gcc-lib/${CCHOST}/${MY_PV_FULL}" BINPATH="${LOC}/${CCHOST}/gcc-bin/${MY_PV}" DATAPATH="${LOC}/share/gcc-data/${CCHOST}/${MY_PV}" # Dont install in /usr/include/g++-v3/, but in gcc internal directory. @@ -228,11 +228,11 @@ src_install() { rm -Rf ${D}/${LOC}/lib/gcc-lib/ rm -Rf ${D}/${LOC}/lib/gcc - mkdir -p ${D}/${LOC}/lib/${PN}/ - mv ${D}/${LOC}/{lib,lib64}/* ${D}/${LOC}/lib/${PN}/ + mkdir -p ${D}/${LOC}/$(get_libdir)/${PN}/ + mv ${D}/${LOC}/{lib,lib64}/* ${D}/${LOC}/$(get_libdir)/${PN}/ mkdir -p ${D}/etc/env.d/ - echo "LDPATH=\"${LOC}/lib/${PN}\"" >> ${D}/etc/env.d/99libffi + echo "LDPATH=\"${LOC}/$(get_libdir)/${PN}\"" >> ${D}/etc/env.d/99libffi echo "CPATH=\"${LOC}/include/${PN}\"" >> ${D}/etc/env.d/99libffi } |