diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-09 07:13:47 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-09 07:13:47 +0000 |
| commit | 9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3 (patch) | |
| tree | 4e895aac712dcde2b1a47afde135983164511ef3 /eclass | |
| parent | Update remove-native wrt library name changes. (diff) | |
| download | gentoo-2-9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3.tar.gz gentoo-2-9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3.tar.bz2 gentoo-2-9ed81cc66c6a2caf8786dc2d5397d57f656ac4b3.zip | |
Remove i686-* renamed tools as well with USE=abi_x86_32.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/emul-linux-x86.eclass | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 51d09c982b61..580628a06221 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1246 2014/05/09 06:51:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1247 2014/05/09 07:13:47 mgorny Exp $ + + 09 May 2014; Michał Górny <mgorny@gentoo.org> emul-linux-x86.eclass: + Remove i686-* renamed tools as well with USE=abi_x86_32. 09 May 2014; Michał Górny <mgorny@gentoo.org> emul-linux-x86.eclass: Remove wrapped headers with USE=abi_x86_32. diff --git a/eclass/emul-linux-x86.eclass b/eclass/emul-linux-x86.eclass index 3d7d66b1ed3c..784a69dc7ce7 100644 --- a/eclass/emul-linux-x86.eclass +++ b/eclass/emul-linux-x86.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.23 2014/05/09 06:51:21 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.24 2014/05/09 07:13:47 mgorny Exp $ # # Original Author: Mike Doty <kingtaco@gentoo.org> @@ -8,7 +8,7 @@ # Purpose: Providing a template for the app-emulation/emul-linux-* packages # -inherit multilib +inherit eutils multilib case "${EAPI:-0}" in 3|4|5) @@ -89,4 +89,8 @@ emul-linux-x86_src_install() { if [[ -d "${D}"/usr/include ]] && use abi_x86_32; then rm -r "${D}"/usr/include || die fi + # The same goes for ${CHOST}- multilib tool prefixing. + if path_exists "${D}"/usr/bin/i686-pc-linux-gnu-* && use abi_x86_32; then + rm "${D}"/usr/bin/i686-pc-linux-gnu-* || die + fi } |