diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-10-28 09:43:49 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-10-28 09:43:49 +0000 |
| commit | d44a07a0e586200e35a79517757c99887880b9c1 (patch) | |
| tree | d9f680eebe46e7af583353e64e459f70eca8b09c /eclass | |
| parent | Fix spelling of CONFIG_CHECK for vhost-net. (diff) | |
| download | gentoo-2-d44a07a0e586200e35a79517757c99887880b9c1.tar.gz gentoo-2-d44a07a0e586200e35a79517757c99887880b9c1.tar.bz2 gentoo-2-d44a07a0e586200e35a79517757c99887880b9c1.zip | |
Do not hardcode lib32, bug #429726 by SpanKY.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/emul-linux-x86.eclass | 12 |
2 files changed, 14 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index bcb128bab5e4..1094264e9e9c 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.472 2012/10/28 09:02:24 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.473 2012/10/28 09:43:49 pacho Exp $ + + 28 Oct 2012; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass: + Do not hardcode lib32, bug #429726 by SpanKY. 28 Oct 2012; Pacho Ramos <pacho@gentoo.org> emul-linux-x86.eclass: Set QA_PREBUILT as all installed files are precompiled. diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass index 7496f9c96f4f..ce007096628a 100644 --- a/eclass/emul-linux-x86.eclass +++ b/eclass/emul-linux-x86.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.12 2012/10/28 09:02:24 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.13 2012/10/28 09:43:49 pacho Exp $ # # Original Author: Mike Doty <kingtaco@gentoo.org> @@ -8,7 +8,7 @@ # Purpose: Providing a template for the app-emulation/emul-linux-* packages # -inherit versionator +inherit multilib versionator if version_is_at_least 20110129; then IUSE="development" @@ -76,4 +76,12 @@ emul-linux-x86_src_install() { find "${S}" -depth -type d -print0 | xargs -0 rmdir 2&>/dev/null cp -pPR "${S}"/* "${ED}"/ || die "copying files failed!" + + # Do not hardcode lib32, bug #429726 + local x86_libdir=$(get_abi_LIBDIR x86) + if [[ ${x86_libdir} != "lib32" ]] ; then + ewarn "Moving lib32/ to ${x86_libdir}/; some libs might not work" + mv "${D}"/usr/lib32 "${D}"/usr/${x86_libdir} || die + mv "${D}"/lib32 "${D}"/${x86_libdir} || die + fi } |