[gentoo-dev] [PATCH 2/3] Export MULTILIB_ABI to obtain the USE flag for ABI.

[Michał Górny]

The main goal for this extra variable is to be able to uniquely identify
an arch+ABI pair, with equality to USE flags being an extra benefit.

Fixes: https://bugs.gentoo.org/show_bug.cgi?id=509478
---
 eclass/multilib-build.eclass | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass
index f369923..4a87af6 100644
--- a/eclass/multilib-build.eclass
+++ b/eclass/multilib-build.eclass
@@ -161,7 +161,9 @@ multilib_get_enabled_abi_pairs() {
 _multilib_multibuild_wrapper() {
        debug-print-function ${FUNCNAME} "${@}"
 
-       local ABI=${MULTIBUILD_VARIANT}
+       local ABI=${MULTIBUILD_VARIANT#*:}
+       local MULTILIB_ABI=${MULTIBUILD_VARIANT%:*}
+
        multilib_toolchain_setup "${ABI}"
        "${@}"
 }
@@ -178,7 +180,7 @@ _multilib_multibuild_wrapper() {
 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 +199,7 @@ multilib_foreach_abi() {
 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 +210,7 @@ multilib_parallel_foreach_abi() {
 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 +264,7 @@ multilib_check_headers() {
 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
 }
 
-- 
1.9.2