mgorny 14/05/07 17:33:49 Modified: ChangeLog multilib-build.eclass Log: Use amd64 headers for i686 when USE=-abi_x86_32 to maintain compatibility with current state of emul-linux. Fixes bug #509556.
Revision Changes Path 1.1242 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1242&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1242&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1241&r2=1.1242 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1241 retrieving revision 1.1242 diff -u -r1.1241 -r1.1242 --- ChangeLog 6 May 2014 20:43:44 -0000 1.1241 +++ ChangeLog 7 May 2014 17:33:49 -0000 1.1242 @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1241 2014/05/06 20:43:44 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1242 2014/05/07 17:33:49 mgorny Exp $ + + 07 May 2014; Michał Górny <[email protected]> multilib-build.eclass: + Use amd64 headers for i686 when USE=-abi_x86_32 to maintain compatibility + with current state of emul-linux. Fixes bug #509556. 06 May 2014; Pacho Ramos <[email protected]> emul-linux-x86.eclass: Move headers to a separate directory, bug #509556 1.47 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.47&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.47&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.46&r2=1.47 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.46 retrieving revision 1.47 diff -u -r1.46 -r1.47 --- multilib-build.eclass 1 May 2014 09:52:27 -0000 1.46 +++ multilib-build.eclass 7 May 2014 17:33:49 -0000 1.47 @@ -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/multilib-build.eclass,v 1.46 2014/05/01 09:52:27 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.47 2014/05/07 17:33:49 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -454,6 +454,14 @@ # Note: match a space afterwards to avoid collision potential. sed -e "/${abi_flag} /s&error.*&include <${CHOST}${f}>&" \ -i "${ED}/tmp/multilib-include${f}" || die + + # Hack for emul-linux-x86 compatibility. + # It assumes amd64 will come after x86, and will use amd64 + # headers if no specific x86 headers were installed. + if [[ ${ABI} == amd64 ]]; then + sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \ + -i "${ED}/tmp/multilib-include${f}" || die + fi fi done fi
