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 721641396D0 for ; Fri, 25 Aug 2017 06:10:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCBA3E0AF0; Fri, 25 Aug 2017 06:10:12 +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 BAF97E085E for ; Fri, 25 Aug 2017 06:10:12 +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 CA70833FE49 for ; Fri, 25 Aug 2017 06:10:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41B0181CF for ; Fri, 25 Aug 2017 06:10:05 +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: <1503641286.98b91d0f75109e56cebd9f2db39ed832b40a4f95.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: 98b91d0f75109e56cebd9f2db39ed832b40a4f95 X-VCS-Branch: master Date: Fri, 25 Aug 2017 06:10:05 +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: 98f3ae67-9cfb-4c45-81d0-589908acae88 X-Archives-Hash: 22e9652a508f19d89e91c9f222da7c03 commit: 98b91d0f75109e56cebd9f2db39ed832b40a4f95 Author: Benda Xu gentoo org> AuthorDate: Fri Aug 25 06:05:41 2017 +0000 Commit: Benda XU gentoo org> CommitDate: Fri Aug 25 06:08:06 2017 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=98b91d0f numeric-int64-multibuild.eclass: MULTILIB_ABI_FLAG should be USE flag The multilib-build eclass expects MULTILIB_ABI_FLAG to be USE flags. If it is set to be ABI, the headers will not be included. Bug: 617312 eclass/numeric-int64-multibuild.eclass | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/eclass/numeric-int64-multibuild.eclass b/eclass/numeric-int64-multibuild.eclass index 68cad0500..1da654c7f 100644 --- a/eclass/numeric-int64-multibuild.eclass +++ b/eclass/numeric-int64-multibuild.eclass @@ -267,7 +267,7 @@ numeric-int64_get_all_abi_variants() { debug-print-function ${FUNCNAME} "${@}" local abi ret=() variant - for abi in $(multilib_get_enabled_abis); do + for abi in $(multilib_get_enabled_abi_pairs); do for variant in $(numeric-int64_get_multibuild_variants); do if [[ ${variant} =~ int64 ]]; then [[ ${abi} =~ amd64 ]] && ret+=( ${abi}_${variant} ) @@ -345,11 +345,22 @@ numeric-int64-multibuild_install_alternative() { # @CODE numeric-int64-multibuild_multilib_wrapper() { debug-print-function ${FUNCNAME} "${@}" - local v="${MULTIBUILD_VARIANT/_${NUMERIC_INT32_SUFFIX}/}" - local v="${v/_${NUMERIC_INT64_SUFFIX}/}" - local ABI="${v/_${NUMERIC_STATIC_SUFFIX}/}" - local -r MULTILIB_ABI_FLAG="${v%.*}" + + local v="${MULTIBUILD_VARIANT%_*}" + 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 + multilib_toolchain_setup "${ABI}" + readonly ABI "${@}" || die }