mgorny 14/05/23 07:11:53 Modified: ChangeLog multilib-build.eclass Log: Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI values and USE flag names.
Revision Changes Path 1.1266 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1266&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1266&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1265&r2=1.1266 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1265 retrieving revision 1.1266 diff -u -r1.1265 -r1.1266 --- ChangeLog 23 May 2014 07:09:07 -0000 1.1265 +++ ChangeLog 23 May 2014 07:11:53 -0000 1.1266 @@ -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.1265 2014/05/23 07:09:07 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1266 2014/05/23 07:11:53 mgorny Exp $ + + 23 May 2014; Michał Górny <mgo...@gentoo.org> multilib-build.eclass: + Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI + values and USE flag names. 23 May 2014; Michał Górny <mgo...@gentoo.org> git-r3.eclass: Give an explanatory error when trying to fetch https:// with 1.49 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.49&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.49&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.48&r2=1.49 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- multilib-build.eclass 12 May 2014 21:56:17 -0000 1.48 +++ multilib-build.eclass 23 May 2014 07:11:53 -0000 1.49 @@ -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.48 2014/05/12 21:56:17 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.49 2014/05/23 07:11:53 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -106,6 +106,21 @@ multilib_get_enabled_abis() { debug-print-function ${FUNCNAME} "${@}" + local pairs=( $(multilib_get_enabled_abi_pairs) ) + echo "${pairs[@]#*:}" +} + +# @FUNCTION: multilib_get_enabled_abi_pairs +# @DESCRIPTION: +# Return the ordered list of enabled <use-flag>:<ABI> pairs +# if multilib builds are enabled. The best (most preferred) +# ABI will come last. +# +# If multilib is disabled, the default ABI will be returned +# along with empty <use-flag>. +multilib_get_enabled_abi_pairs() { + debug-print-function ${FUNCNAME} "${@}" + local abis=( $(get_all_abis) ) local abi i found @@ -119,7 +134,7 @@ # 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 - echo "${abi}" + echo "${m_flag}:${abi}" found=1 break 2 fi @@ -134,7 +149,7 @@ debug-print "${FUNCNAME}: no ABIs enabled, fallback to ${abi}" debug-print "${FUNCNAME}: ABI=${ABI}, DEFAULT_ABI=${DEFAULT_ABI}" - echo ${abi} + echo ":${abi}" fi }
