mgorny 14/05/23 07:38:36 Modified: ChangeLog multilib-build.eclass Log: Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478.
Revision Changes Path 1.1267 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1267&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1266&r2=1.1267 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.1266 retrieving revision 1.1267 diff -u -r1.1266 -r1.1267 --- ChangeLog 23 May 2014 07:11:53 -0000 1.1266 +++ ChangeLog 23 May 2014 07:38:36 -0000 1.1267 @@ -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.1266 2014/05/23 07:11:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1267 2014/05/23 07:38:36 mgorny Exp $ + + 23 May 2014; Michał Górny <mgo...@gentoo.org> multilib-build.eclass: + Export MULTILIB_ABI_FLAG for ebuild/eclass use. Bug #509478. 23 May 2014; Michał Górny <mgo...@gentoo.org> multilib-build.eclass: Introduce multilib_get_enabled_abi_pairs() to obtain list containing both ABI 1.50 eclass/multilib-build.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?rev=1.50&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/multilib-build.eclass?r1=1.49&r2=1.50 Index: multilib-build.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- multilib-build.eclass 23 May 2014 07:11:53 -0000 1.49 +++ multilib-build.eclass 23 May 2014 07:38:36 -0000 1.50 @@ -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.49 2014/05/23 07:11:53 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/multilib-build.eclass,v 1.50 2014/05/23 07:38:36 mgorny Exp $ # @ECLASS: multilib-build.eclass # @MAINTAINER: @@ -74,6 +74,24 @@ # net-libs/libbar[ssl,${MULTILIB_USEDEP}]" # @CODE +# @ECLASS-VARIABLE: MULTILIB_ABI_FLAG +# @DEFAULT_UNSET +# @DESCRIPTION: +# The complete ABI name. Resembles the USE flag name. +# +# This is set within multilib_foreach_abi(), +# multilib_parallel_foreach_abi() and multilib-minimal sub-phase +# functions. +# +# It may be null (empty) when the build is done on ABI not controlled +# by a USE flag (e.g. on non-multilib arch or when using multilib +# portage). The build will always be done for a single ABI then. +# +# Example value: +# @CODE +# abi_x86_64 +# @CODE + _multilib_build_set_globals() { local flags=( "${_MULTILIB_FLAGS[@]%:*}" ) @@ -161,7 +179,9 @@ _multilib_multibuild_wrapper() { debug-print-function ${FUNCNAME} "${@}" - local ABI=${MULTIBUILD_VARIANT} + local ABI=${MULTIBUILD_VARIANT#*:} + local MULTILIB_ABI_FLAG=${MULTIBUILD_VARIANT%:*} + multilib_toolchain_setup "${ABI}" "${@}" } @@ -178,7 +198,7 @@ multilib_foreach_abi() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" } @@ -197,7 +217,7 @@ multilib_parallel_foreach_abi() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}" } @@ -208,7 +228,7 @@ multilib_for_best_abi() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" } @@ -262,7 +282,7 @@ multilib_copy_sources() { debug-print-function ${FUNCNAME} "${@}" - local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) + local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) multibuild_copy_sources }
