diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-06-26 20:43:13 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-06-26 20:43:13 +0000 |
| commit | a113ad75e2f71ae81a340c2688c69e7f18692ea8 (patch) | |
| tree | 2212fdc3566531de0d8f2df8cb9107f9725ed49a /eclass | |
| parent | Remove KDE Frameworks 5.10.0 (diff) | |
| download | gentoo-2-a113ad75e2f71ae81a340c2688c69e7f18692ea8.tar.gz gentoo-2-a113ad75e2f71ae81a340c2688c69e7f18692ea8.tar.bz2 gentoo-2-a113ad75e2f71ae81a340c2688c69e7f18692ea8.zip | |
Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 12 |
2 files changed, 6 insertions, 11 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 713a355f6718..cb18623c8040 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1684 2015/06/24 17:04:53 williamh Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1685 2015/06/26 20:43:13 mgorny Exp $ + + 26 Jun 2015; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Remove emul-linux-x86 hack, since emul-linux-x86 is no more. 24 Jun 2015; William Hubbs <williamh@gentoo.org> golang-build.eclass: typo fix, use double brackets diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 3509366fbd4f..085f05ceaf88 100644 --- a/eclass/multilib-build.eclass +++ b/eclass/multilib-build.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.65 2014/12/13 08:41:37 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.66 2015/06/26 20:43:13 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -513,14 +513,6 @@ _EOF_ sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \ -i "${wrapper}" || 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 "${wrapper}" || die - fi - # Needed for swig. if multilib_is_native_abi; then sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \ |