1 |
mgorny 15/06/26 20:43:13 |
2 |
|
3 |
Modified: ChangeLog multilib-build.eclass |
4 |
Log: |
5 |
Remove emul-linux-x86 hack, since emul-linux-x86 is no more. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1685 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1685&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1684&r2=1.1685 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1684 |
18 |
retrieving revision 1.1685 |
19 |
diff -u -r1.1684 -r1.1685 |
20 |
--- ChangeLog 24 Jun 2015 17:04:53 -0000 1.1684 |
21 |
+++ ChangeLog 26 Jun 2015 20:43:13 -0000 1.1685 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1684 2015/06/24 17:04:53 williamh Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1685 2015/06/26 20:43:13 mgorny Exp $ |
27 |
+ |
28 |
+ 26 Jun 2015; Michał Górny <mgorny@g.o> multilib-build.eclass: |
29 |
+ Remove emul-linux-x86 hack, since emul-linux-x86 is no more. |
30 |
|
31 |
24 Jun 2015; William Hubbs <williamh@g.o> golang-build.eclass: |
32 |
typo fix, use double brackets |
33 |
|
34 |
|
35 |
|
36 |
1.66 eclass/multilib-build.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.66&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.65&r2=1.66 |
41 |
|
42 |
Index: multilib-build.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
45 |
retrieving revision 1.65 |
46 |
retrieving revision 1.66 |
47 |
diff -u -r1.65 -r1.66 |
48 |
--- multilib-build.eclass 13 Dec 2014 08:41:37 -0000 1.65 |
49 |
+++ multilib-build.eclass 26 Jun 2015 20:43:13 -0000 1.66 |
50 |
@@ -1,6 +1,6 @@ |
51 |
-# Copyright 1999-2014 Gentoo Foundation |
52 |
+# Copyright 1999-2015 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.65 2014/12/13 08:41:37 mgorny Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.66 2015/06/26 20:43:13 mgorny Exp $ |
56 |
|
57 |
# @ECLASS: multilib-build.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -513,14 +513,6 @@ |
60 |
sed -e "/${MULTILIB_ABI_FLAG} /s&error.*&include <${CHOST}${f}>&" \ |
61 |
-i "${wrapper}" || die |
62 |
|
63 |
- # Hack for emul-linux-x86 compatibility. |
64 |
- # It assumes amd64 will come after x86, and will use amd64 |
65 |
- # headers if no specific x86 headers were installed. |
66 |
- if [[ ${ABI} == amd64 ]]; then |
67 |
- sed -e "/abi_x86_32 /s&error.*&include <${CHOST}${f}>&" \ |
68 |
- -i "${wrapper}" || die |
69 |
- fi |
70 |
- |
71 |
# Needed for swig. |
72 |
if multilib_is_native_abi; then |
73 |
sed -e "/Native ABI/s&error.*&include <${CHOST}${f}>&" \ |