commit: 575f949150dafd0288bf9d28bcf6acc1f6474408 Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> AuthorDate: Tue Aug 29 13:49:05 2017 +0000 Commit: Benda XU <heroxbd <AT> gentoo <DOT> org> CommitDate: Tue Aug 29 13:49:05 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=575f9491
numeric-int64-multibuild.eclass: consider _static build variant. _static is considered to be a different variant in this eclass, but is no different from its dynamic conterpart in multilib.eclass. Credit: Tom Daff Closes: https://github.com/gentoo/sci/issues/809 eclass/numeric-int64-multibuild.eclass | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/eclass/numeric-int64-multibuild.eclass b/eclass/numeric-int64-multibuild.eclass index 1da654c7f..6403ee79c 100644 --- a/eclass/numeric-int64-multibuild.eclass +++ b/eclass/numeric-int64-multibuild.eclass @@ -347,17 +347,23 @@ numeric-int64-multibuild_multilib_wrapper() { debug-print-function ${FUNCNAME} "${@}" local v="${MULTIBUILD_VARIANT%_*}" + # MULTIBUILD_VARIANT could be abi_x86_64.amd64_static_int32 + v=${v%_${NUMERIC_STATIC_SUFFIX}} local ABI="${v#*.}" # hack: our int64 and int32 ABIs can correspond to the same ABI # in multilib, resulting in multiple sed replacements of headers # and thus error like "Flag not listed in wrapper template." # Using MULTILIB_ABI_FLAG="${ABI}", the corresponding header # is ignored. - if [[ ${MULTIBUILD_VARIANT##*_} == ${NUMERIC_INT32_SUFFIX} ]] ; then - local -r MULTILIB_ABI_FLAG="${v%.*}" - else - local -r MULTILIB_ABI_FLAG="${ABI}" - fi + local MULTILIB_ABI_FLAG + case ${MULTIBUILD_VARIANT} in + *_${NUMERIC_STATIC_SUFFIX}*|*_${NUMERIC_INT64_SUFFIX}) + MULTILIB_ABI_FLAG="${ABI}" + ;; + *_${NUMERIC_INT32_SUFFIX}) + MULTILIB_ABI_FLAG="${v%.*}" + ;; + esac multilib_toolchain_setup "${ABI}" readonly ABI
