1 |
mgorny 14/06/29 08:32:46 |
2 |
|
3 |
Modified: ChangeLog multilib-build.eclass |
4 |
Log: |
5 |
Fix handling empty MULTILIB_COMPAT. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1305 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1305&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1305&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1304&r2=1.1305 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1304 |
18 |
retrieving revision 1.1305 |
19 |
diff -u -r1.1304 -r1.1305 |
20 |
--- ChangeLog 29 Jun 2014 07:53:33 -0000 1.1304 |
21 |
+++ ChangeLog 29 Jun 2014 08:32:46 -0000 1.1305 |
22 |
@@ -1,6 +1,9 @@ |
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.1304 2014/06/29 07:53:33 mgorny Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1305 2014/06/29 08:32:46 mgorny Exp $ |
27 |
+ |
28 |
+ 29 Jun 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
29 |
+ Fix handling empty MULTILIB_COMPAT. |
30 |
|
31 |
29 Jun 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
32 |
Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg |
33 |
|
34 |
|
35 |
|
36 |
1.59 eclass/multilib-build.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.59&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.59&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.58&r2=1.59 |
41 |
|
42 |
Index: multilib-build.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
45 |
retrieving revision 1.58 |
46 |
retrieving revision 1.59 |
47 |
diff -u -r1.58 -r1.59 |
48 |
--- multilib-build.eclass 29 Jun 2014 07:53:33 -0000 1.58 |
49 |
+++ multilib-build.eclass 29 Jun 2014 08:32:46 -0000 1.59 |
50 |
@@ -1,6 +1,6 @@ |
51 |
# Copyright 1999-2014 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.59 2014/06/29 08:32:46 mgorny Exp $ |
55 |
|
56 |
# @ECLASS: multilib-build.eclass |
57 |
# @MAINTAINER: |
58 |
@@ -154,7 +154,7 @@ |
59 |
# for the split is more complex than cheating like this |
60 |
for m_abi in ${m_abis//,/ }; do |
61 |
if [[ ${m_abi} == ${abi} ]] \ |
62 |
- && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \ |
63 |
+ && { [[ ! "${MULTILIB_COMPAT[@]}" ]] || has "${m_flag}" "${MULTILIB_COMPAT[@]}"; } \ |
64 |
&& use "${m_flag}" |
65 |
then |
66 |
echo "${m_flag}.${abi}" |