summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-29 07:53:33 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-29 07:53:33 +0000
commite4f926a17450a993517feb22c3ad58ae1fb88887 (patch)
tree61efd33628579e9a6d73dcd364fa406ae6aba251 /eclass/multilib-build.eclass
parentVersion bump. (diff)
downloadhistorical-e4f926a17450a993517feb22c3ad58ae1fb88887.tar.gz
historical-e4f926a17450a993517feb22c3ad58ae1fb88887.tar.bz2
historical-e4f926a17450a993517feb22c3ad58ae1fb88887.zip
Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg Turner.
Diffstat (limited to 'eclass/multilib-build.eclass')
-rw-r--r--eclass/multilib-build.eclass7
1 files changed, 5 insertions, 2 deletions
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index 268bf04dc7c5..5f43f72fd048 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.57 2014/06/28 09:56:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.58 2014/06/29 07:53:33 mgorny Exp $
# @ECLASS: multilib-build.eclass
# @MAINTAINER:
@@ -153,7 +153,10 @@ multilib_get_enabled_abi_pairs() {
# paludis is broken (bug #486592), and switching it locally
# for the split is more complex than cheating like this
for m_abi in ${m_abis//,/ }; do
- if [[ ${m_abi} == ${abi} ]] && use "${m_flag}"; then
+ if [[ ${m_abi} == ${abi} ]] \
+ && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \
+ && use "${m_flag}"
+ then
echo "${m_flag}.${abi}"
found=1
break 2