From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 224D81396D0 for ; Tue, 29 Aug 2017 13:52:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 685371FC03C; Tue, 29 Aug 2017 13:52:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A26B1FC03C for ; Tue, 29 Aug 2017 13:52:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F59E33BE69 for ; Tue, 29 Aug 2017 13:52:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8930D86C6 for ; Tue, 29 Aug 2017 13:52:13 +0000 (UTC) From: "Benda XU" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Benda XU" Message-ID: <1504014545.575f949150dafd0288bf9d28bcf6acc1f6474408.heroxbd@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: eclass/ X-VCS-Repository: proj/sci X-VCS-Files: eclass/numeric-int64-multibuild.eclass X-VCS-Directories: eclass/ X-VCS-Committer: heroxbd X-VCS-Committer-Name: Benda XU X-VCS-Revision: 575f949150dafd0288bf9d28bcf6acc1f6474408 X-VCS-Branch: master Date: Tue, 29 Aug 2017 13:52:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4de7deea-358a-41ec-b42c-d3823c7ef8fa X-Archives-Hash: 8f1adca4ad972550782f86a031f57117 commit: 575f949150dafd0288bf9d28bcf6acc1f6474408 Author: Benda Xu gentoo org> AuthorDate: Tue Aug 29 13:49:05 2017 +0000 Commit: Benda XU gentoo 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