mgorny 14/05/09 07:13:47 Modified: ChangeLog emul-linux-x86.eclass Log: Remove i686-* renamed tools as well with USE=abi_x86_32.
Revision Changes Path 1.1247 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1247&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1247&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1246&r2=1.1247 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1246 retrieving revision 1.1247 diff -u -r1.1246 -r1.1247 --- ChangeLog 9 May 2014 06:51:21 -0000 1.1246 +++ ChangeLog 9 May 2014 07:13:47 -0000 1.1247 @@ -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 <[email protected]> emul-linux-x86.eclass: + Remove i686-* renamed tools as well with USE=abi_x86_32. 09 May 2014; Michał Górny <[email protected]> emul-linux-x86.eclass: Remove wrapped headers with USE=abi_x86_32. 1.24 eclass/emul-linux-x86.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.24&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.24&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.23&r2=1.24 Index: emul-linux-x86.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- emul-linux-x86.eclass 9 May 2014 06:51:21 -0000 1.23 +++ emul-linux-x86.eclass 9 May 2014 07:13:47 -0000 1.24 @@ -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 <[email protected]> @@ -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 @@ 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 }
