diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-05-07 17:33:49 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-05-07 17:33:49 +0000 |
| commit | b59382c911dd09188f9245be66014a536b196622 (patch) | |
| tree | ab261286b55d99717051ff7993e5de38ca2f86d0 | |
| parent | x86 stable wrt bug #504210 (diff) | |
| download | historical-b59382c911dd09188f9245be66014a536b196622.tar.gz historical-b59382c911dd09188f9245be66014a536b196622.tar.bz2 historical-b59382c911dd09188f9245be66014a536b196622.zip | |
Use amd64 headers for i686 when USE=-abi_x86_32 to maintain compatibility with current state of emul-linux. Fixes bug #509556.
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0451fea31d97..046973051a85 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -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 <mgorny@gentoo.org> 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 <pacho@gentoo.org> emul-linux-x86.eclass: Move headers to a separate directory, bug #509556 diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index ddf11cc90708..fd5b89347b19 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.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/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 @@ _EOF_ # 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 |