mgorny 14/05/09 06:51:21 Modified: ChangeLog emul-linux-x86.eclass Log: Remove wrapped headers with USE=abi_x86_32.
Revision Changes Path 1.1246 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1246&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1246&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1245&r2=1.1246 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1245 retrieving revision 1.1246 diff -u -r1.1245 -r1.1246 --- ChangeLog 8 May 2014 21:39:34 -0000 1.1245 +++ ChangeLog 9 May 2014 06:51:21 -0000 1.1246 @@ -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.1245 2014/05/08 21:39:34 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1246 2014/05/09 06:51:21 mgorny Exp $ + + 09 May 2014; Michał Górny <mgo...@gentoo.org> emul-linux-x86.eclass: + Remove wrapped headers with USE=abi_x86_32. 08 May 2014; Pacho Ramos <pa...@gentoo.org> emul-linux-x86.eclass: Previous approach was wrong 1.23 eclass/emul-linux-x86.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.23&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?rev=1.23&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/emul-linux-x86.eclass?r1=1.22&r2=1.23 Index: emul-linux-x86.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- emul-linux-x86.eclass 8 May 2014 21:39:34 -0000 1.22 +++ emul-linux-x86.eclass 9 May 2014 06:51:21 -0000 1.23 @@ -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.22 2014/05/08 21:39:34 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/emul-linux-x86.eclass,v 1.23 2014/05/09 06:51:21 mgorny Exp $ # # Original Author: Mike Doty <kingt...@gentoo.org> @@ -82,4 +82,11 @@ popd >/dev/null fi + + # Since header wrapping is added as part of gx86-multilib support, + # all packages involved install their own copies of i686* headers + # when built with abi_x86_32. + if [[ -d "${D}"/usr/include ]] && use abi_x86_32; then + rm -r "${D}"/usr/include || die + fi }
