diff options
| author |   Piotr Jaroszyński <peper@gentoo.org> | 2006-11-05 01:02:38 +0000 |
|---|---|---|
| committer | Piotr Jaroszyński <peper@gentoo.org> | 2006-11-05 01:02:38 +0000 |
| commit | b7f7a2eaab0be450d341772a36e4085a15fee78c (patch) | |
| tree | 2d6460b07c5965e7cb85c57dee854069a9febfdf /dev-libs/libffi | |
| parent | Change "tcltk" USE flag to "tk", bug #17808 (diff) | |
| download | gentoo-2-b7f7a2eaab0be450d341772a36e4085a15fee78c.tar.gz gentoo-2-b7f7a2eaab0be450d341772a36e4085a15fee78c.tar.bz2 gentoo-2-b7f7a2eaab0be450d341772a36e4085a15fee78c.zip | |
Fix multilib. Thanks to David Leverton <u01drl3@abdn.ac.uk> in bug #154065.
(Portage version: 2.1.2_rc1-r2)
Diffstat (limited to 'dev-libs/libffi')
| -rw-r--r-- | dev-libs/libffi/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-libs/libffi/libffi-3.4.1.ebuild | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog index 3591f6984423..acc80d530e95 100644 --- a/dev-libs/libffi/ChangeLog +++ b/dev-libs/libffi/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/libffi # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.43 2006/08/14 16:51:18 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.44 2006/11/05 01:02:38 peper Exp $ + + 05 Nov 2006; Piotr Jaroszyński <peper@gentoo.org> libffi-3.4.1.ebuild: + Fix multilib. Thanks to David Leverton <u01drl3@abdn.ac.uk> in bug #154065. 14 Aug 2006; Christian Heim <phreak@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/libffi-3.4.1.ebuild b/dev-libs/libffi/libffi-3.4.1.ebuild index 4be5e8238fd4..f37270b48960 100644 --- a/dev-libs/libffi/libffi-3.4.1.ebuild +++ b/dev-libs/libffi/libffi-3.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 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.14 2006/08/14 16:51:18 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/libffi-3.4.1.ebuild,v 1.15 2006/11/05 01:02:38 peper Exp $ IUSE="nls nptl" SLOT="0" @@ -220,14 +220,14 @@ src_install() { # we want the headers... mkdir -p ${D}/${LOC}/include/${PN} - mv ${D}/${LOC}/lib/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN} + mv ${D}/${LOC}/$(get_libdir)/gcc-lib/${CCHOST}/${PV}/include/* ${D}/${LOC}/include/${PN} mv ${D}/${LOC}/lib/gcc/${CCHOST}/${PV}/include/libffi/* ${D}/${LOC}/include/${PN} # remove now useless directory... - rm -Rf ${D}/${LOC}/lib/gcc-lib/ + rm -Rf ${D}/${LOC}/$(get_libdir)/gcc-lib/ rm -Rf ${D}/${LOC}/lib/gcc mkdir -p ${D}/${LOC}/$(get_libdir)/${PN}/ - mv ${D}/${LOC}/{lib,lib64}/* ${D}/${LOC}/$(get_libdir)/${PN}/ + mv ${D}/${LOC}/$(get_libdir)/* ${D}/${LOC}/$(get_libdir)/${PN}/ mkdir -p ${D}/etc/env.d/ echo "LDPATH=\"${LOC}/$(get_libdir)/${PN}\"" >> ${D}/etc/env.d/99libffi |