1 |
mgorny 14/04/29 20:56:46 |
2 |
|
3 |
Modified: ChangeLog multilib-build.eclass |
4 |
Log: |
5 |
Disable wrappers for multilib portage only. Enable them in non-multilib profiles for consistency. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1229 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1229&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1229&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1228&r2=1.1229 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1228 |
18 |
retrieving revision 1.1229 |
19 |
diff -u -r1.1228 -r1.1229 |
20 |
--- ChangeLog 29 Apr 2014 20:54:54 -0000 1.1228 |
21 |
+++ ChangeLog 29 Apr 2014 20:56:46 -0000 1.1229 |
22 |
@@ -1,6 +1,10 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1228 2014/04/29 20:54:54 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1229 2014/04/29 20:56:46 mgorny Exp $ |
27 |
+ |
28 |
+ 29 Apr 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
29 |
+ Disable wrappers for multilib portage only. Enable them in non-multilib |
30 |
+ profiles for consistency. |
31 |
|
32 |
29 Apr 2014; Michał Górny <mgorny@g.o> cmake-multilib.eclass, |
33 |
multilib-build.eclass, multilib-minimal.eclass: |
34 |
|
35 |
|
36 |
|
37 |
1.42 eclass/multilib-build.eclass |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.42&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.42&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.41&r2=1.42 |
42 |
|
43 |
Index: multilib-build.eclass |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
46 |
retrieving revision 1.41 |
47 |
retrieving revision 1.42 |
48 |
diff -u -r1.41 -r1.42 |
49 |
--- multilib-build.eclass 29 Apr 2014 20:54:54 -0000 1.41 |
50 |
+++ multilib-build.eclass 29 Apr 2014 20:56:46 -0000 1.42 |
51 |
@@ -1,6 +1,6 @@ |
52 |
# Copyright 1999-2014 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.41 2014/04/29 20:54:54 mgorny Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.42 2014/04/29 20:56:46 mgorny Exp $ |
56 |
|
57 |
# @ECLASS: multilib-build.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -295,7 +295,7 @@ |
60 |
|
61 |
[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" |
62 |
|
63 |
- [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return |
64 |
+ [[ ${COMPLETE_MULTILIB} == yes ]] && return |
65 |
|
66 |
local root=${1:-${ED}} |
67 |
local f |
68 |
@@ -421,7 +421,7 @@ |
69 |
|
70 |
[[ ${#} -le 1 ]] || die "${FUNCNAME}: too many arguments" |
71 |
|
72 |
- [[ ${#MULTIBUILD_VARIANTS[@]} -le 1 ]] && return |
73 |
+ [[ ${COMPLETE_MULTILIB} == yes ]] && return |
74 |
|
75 |
local root=${1:-${ED}} |