| 1 |
The main goal for this extra variable is to be able to uniquely identify |
| 2 |
an arch+ABI pair, with equality to USE flags being an extra benefit. |
| 3 |
|
| 4 |
Fixes: https://bugs.gentoo.org/show_bug.cgi?id=509478 |
| 5 |
--- |
| 6 |
eclass/multilib-build.eclass | 12 +++++++----- |
| 7 |
1 file changed, 7 insertions(+), 5 deletions(-) |
| 8 |
|
| 9 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
| 10 |
index f369923..4a87af6 100644 |
| 11 |
--- a/eclass/multilib-build.eclass |
| 12 |
+++ b/eclass/multilib-build.eclass |
| 13 |
@@ -161,7 +161,9 @@ multilib_get_enabled_abi_pairs() { |
| 14 |
_multilib_multibuild_wrapper() { |
| 15 |
debug-print-function ${FUNCNAME} "${@}" |
| 16 |
|
| 17 |
- local ABI=${MULTIBUILD_VARIANT} |
| 18 |
+ local ABI=${MULTIBUILD_VARIANT#*:} |
| 19 |
+ local MULTILIB_ABI=${MULTIBUILD_VARIANT%:*} |
| 20 |
+ |
| 21 |
multilib_toolchain_setup "${ABI}" |
| 22 |
"${@}" |
| 23 |
} |
| 24 |
@@ -178,7 +180,7 @@ _multilib_multibuild_wrapper() { |
| 25 |
multilib_foreach_abi() { |
| 26 |
debug-print-function ${FUNCNAME} "${@}" |
| 27 |
|
| 28 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 29 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 30 |
multibuild_foreach_variant _multilib_multibuild_wrapper "${@}" |
| 31 |
} |
| 32 |
|
| 33 |
@@ -197,7 +199,7 @@ multilib_foreach_abi() { |
| 34 |
multilib_parallel_foreach_abi() { |
| 35 |
debug-print-function ${FUNCNAME} "${@}" |
| 36 |
|
| 37 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 38 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 39 |
multibuild_parallel_foreach_variant _multilib_multibuild_wrapper "${@}" |
| 40 |
} |
| 41 |
|
| 42 |
@@ -208,7 +210,7 @@ multilib_parallel_foreach_abi() { |
| 43 |
multilib_for_best_abi() { |
| 44 |
debug-print-function ${FUNCNAME} "${@}" |
| 45 |
|
| 46 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 47 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 48 |
|
| 49 |
multibuild_for_best_variant _multilib_multibuild_wrapper "${@}" |
| 50 |
} |
| 51 |
@@ -262,7 +264,7 @@ multilib_check_headers() { |
| 52 |
multilib_copy_sources() { |
| 53 |
debug-print-function ${FUNCNAME} "${@}" |
| 54 |
|
| 55 |
- local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abis) ) |
| 56 |
+ local MULTIBUILD_VARIANTS=( $(multilib_get_enabled_abi_pairs) ) |
| 57 |
multibuild_copy_sources |
| 58 |
} |
| 59 |
|
| 60 |
-- |
| 61 |
1.9.2 |
Archives