mgorny 14/06/29 08:32:46 Modified: ChangeLog multilib-build.eclass Log: Fix handling empty MULTILIB_COMPAT.
Revision Changes Path 1.1305 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1305&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1305&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1304&r2=1.1305 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1304 retrieving revision 1.1305 diff -u -r1.1304 -r1.1305 --- ChangeLog 29 Jun 2014 07:53:33 -0000 1.1304 +++ ChangeLog 29 Jun 2014 08:32:46 -0000 1.1305 @@ -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 <[email protected]> multilib-build.eclass: + Fix handling empty MULTILIB_COMPAT. 29 Jun 2014; Michał Górny <[email protected]> multilib-build.eclass: Check MULTILIB_COMPAT before querying USE flags. Bug #515642, thanks to Greg 1.59 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.59&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.59&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.58&r2=1.59 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- multilib-build.eclass 29 Jun 2014 07:53:33 -0000 1.58 +++ multilib-build.eclass 29 Jun 2014 08:32:46 -0000 1.59 @@ -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 @@ # 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}"
