diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-29 07:53:33 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-29 07:53:33 +0000 |
| commit | c0a3c14385af7bc5ec3eedabe55b16a5ecd0c2ae (patch) | |
| tree | 23968ba8869450f017656abc0d16bf869fa9d2ba /eclass | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c0a3c14385af7bc5ec3eedabe55b16a5ecd0c2ae.tar.gz gentoo-2-c0a3c14385af7bc5ec3eedabe55b16a5ecd0c2ae.tar.bz2 gentoo-2-c0a3c14385af7bc5ec3eedabe55b16a5ecd0c2ae.zip | |
Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg Turner.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 0e65a2095861..681da7370937 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1303 2014/06/28 09:56:25 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1304 2014/06/29 07:53:33 mgorny Exp $ + + 29 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg + Turner. 28 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Enable multilib flags for ppc. Since ppc profiles are not multilib at the 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 |