mgorny      15/06/26 20:43:13

  Modified:             ChangeLog multilib-build.eclass
  Log:
  Remove emul-linux-x86 hack, since emul-linux-x86 is no more.

Revision  Changes    Path
1.1685               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1684&r2=1.1685

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1684
retrieving revision 1.1685
diff -u -r1.1684 -r1.1685
--- ChangeLog   24 Jun 2015 17:04:53 -0000      1.1684
+++ ChangeLog   26 Jun 2015 20:43:13 -0000      1.1685
@@ -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 <mgo...@gentoo.org> multilib-build.eclass:
+  Remove emul-linux-x86 hack, since emul-linux-x86 is no more.
 
   24 Jun 2015; William Hubbs <willi...@gentoo.org> golang-build.eclass:
   typo fix, use double brackets



1.66                 eclass/multilib-build.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.65&r2=1.66

Index: multilib-build.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- multilib-build.eclass       13 Dec 2014 08:41:37 -0000      1.65
+++ multilib-build.eclass       26 Jun 2015 20:43:13 -0000      1.66
@@ -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 @@
                                        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}>&" \




Reply via email to