diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-29 08:32:46 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-29 08:32:46 +0000 |
| commit | b14cab9f87aba242dc6ed56f7d7da20f5ba795ad (patch) | |
| tree | 6106a43f74695f0dc98d2f0d95f2b616dd4c8e37 /eclass | |
| parent | Add dependency towards sec-policy/selinux-nut if USE=selinux is set (diff) | |
| download | gentoo-2-b14cab9f87aba242dc6ed56f7d7da20f5ba795ad.tar.gz gentoo-2-b14cab9f87aba242dc6ed56f7d7da20f5ba795ad.tar.bz2 gentoo-2-b14cab9f87aba242dc6ed56f7d7da20f5ba795ad.zip | |
Fix handling empty MULTILIB_COMPAT.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/multilib-build.eclass | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 681da7370937..a4d57c00c1f0 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1304 2014/06/29 07:53:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1305 2014/06/29 08:32:46 mgorny Exp $ + + 29 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: + Fix handling empty MULTILIB_COMPAT. 29 Jun 2014; Michał Górny <mgorny@gentoo.org> multilib-build.eclass: Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass index 5f43f72fd048..ba3ebc044bda 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.58 2014/06/29 07:53:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.59 2014/06/29 08:32:46 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -154,7 +154,7 @@ multilib_get_enabled_abi_pairs() { # for the split is more complex than cheating like this for m_abi in ${m_abis//,/ }; do if [[ ${m_abi} == ${abi} ]] \ - && has "${m_flag}" "${MULTILIB_COMPAT[@]}" \ + && { [[ ! "${MULTILIB_COMPAT[@]}" ]] || has "${m_flag}" "${MULTILIB_COMPAT[@]}"; } \ && use "${m_flag}" then echo "${m_flag}.${abi}" |