| 1 |
mgorny 14/06/29 07:53:33 |
| 2 |
|
| 3 |
Modified: ChangeLog multilib-build.eclass |
| 4 |
Log: |
| 5 |
Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg Turner. |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.1304 eclass/ChangeLog |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1304&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1304&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1303&r2=1.1304 |
| 13 |
|
| 14 |
Index: ChangeLog |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
| 17 |
retrieving revision 1.1303 |
| 18 |
retrieving revision 1.1304 |
| 19 |
diff -u -r1.1303 -r1.1304 |
| 20 |
--- ChangeLog 28 Jun 2014 09:56:25 -0000 1.1303 |
| 21 |
+++ ChangeLog 29 Jun 2014 07:53:33 -0000 1.1304 |
| 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.1303 2014/06/28 09:56:25 mgorny Exp $ |
| 26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1304 2014/06/29 07:53:33 mgorny Exp $ |
| 27 |
+ |
| 28 |
+ 29 Jun 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 29 |
+ Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg |
| 30 |
+ Turner. |
| 31 |
|
| 32 |
28 Jun 2014; Michał Górny <mgorny@g.o> multilib-build.eclass: |
| 33 |
Enable multilib flags for ppc. Since ppc profiles are not multilib at the |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.58 eclass/multilib-build.eclass |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.58&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.58&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.57&r2=1.58 |
| 42 |
|
| 43 |
Index: multilib-build.eclass |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v |
| 46 |
retrieving revision 1.57 |
| 47 |
retrieving revision 1.58 |
| 48 |
diff -u -r1.57 -r1.58 |
| 49 |
--- multilib-build.eclass 28 Jun 2014 09:56:26 -0000 1.57 |
| 50 |
+++ multilib-build.eclass 29 Jun 2014 07:53:33 -0000 1.58 |
| 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.57 2014/06/28 09:56:26 mgorny Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $ |
| 56 |
|
| 57 |
# @ECLASS: multilib-build.eclass |
| 58 |
# @MAINTAINER: |
| 59 |
@@ -153,7 +153,10 @@ |
| 60 |
# paludis is broken (bug #486592), and switching it locally |
| 61 |
# for the split is more complex than cheating like this |
| 62 |
for m_abi in ${m_abis//,/ }; do |
| 63 |
- if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then |
| 64 |
+ if [[ ${m_abi} == ${abi} ]] \ |
| 65 |
+ && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \ |
| 66 |
+ && use "${m_flag}" |
| 67 |
+ then |
| 68 |
echo "${m_flag}.${abi}" |
| 69 |
found=1 |
| 70 |
break 2 |
Archives