From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DC31313838B for ; Mon, 6 Oct 2014 05:56:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AC87E0AD9; Mon, 6 Oct 2014 05:56:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 69F0CE0A89 for ; Mon, 6 Oct 2014 05:56:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 47E2A340278 for ; Mon, 6 Oct 2014 05:56:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04A1B71A6 for ; Mon, 6 Oct 2014 05:56:38 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1411816207.76559c8bbd22f9fa2093008c96a0948c95e2a7f3.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/openblas/openblas-9999.ebuild X-VCS-Directories: sci-libs/openblas/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 76559c8bbd22f9fa2093008c96a0948c95e2a7f3 X-VCS-Branch: master Date: Mon, 6 Oct 2014 05:56:38 +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: 1189dd0f-41a1-4df6-8ac1-698d5fa505f3 X-Archives-Hash: c1ddbb180d4b39b936541f0df9210fe9 commit: 76559c8bbd22f9fa2093008c96a0948c95e2a7f3 Author: gienah gentoo org> AuthorDate: Tue Feb 25 13:44:08 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sat Sep 27 11:10:07 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=76559c8b openblas: Strip the _int64 suffix from the BUILD_VARIANT to calculate the ABI --- sci-libs/openblas/openblas-9999.ebuild | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild index 1c2b6c6..f012efd 100644 --- a/sci-libs/openblas/openblas-9999.ebuild +++ b/sci-libs/openblas/openblas-9999.ebuild @@ -74,11 +74,15 @@ int64_multilib_get_enabled_abis() { # will be overwritten by the normal variant in the install, which removes the # #define OPENBLAS_USE64BITINT for us. We then specify it in Cflags in the # /usr/lib64/pkg-config/openblas-int64-{threads,openmp}.pc file. + local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) ) local MULTIBUILD_VARIANTS=( ) - use int64 && \ - MULTIBUILD_VARIANTS+=( ${BASE_PROFNAME}_${INT64_SUFFIX} ) - MULTIBUILD_VARIANTS+=( $(multilib_get_enabled_abis) ) - echo "${MULTIBUILD_VARIANTS[*]}" + for i in "${MULTILIB_VARIANTS[@]}"; do + if use int64 && [[ "${i}" =~ 64$ ]]; then + MULTIBUILD_VARIANTS+=( "${i}_${INT64_SUFFIX}" ) + fi + MULTIBUILD_VARIANTS+=( "${i}" ) + done + echo "${MULTIBUILD_VARIANTS[@]}" } # @FUNCTION: _int64_multilib_multibuild_wrapper @@ -89,12 +93,10 @@ int64_multilib_get_enabled_abis() { _int64_multilib_multibuild_wrapper() { debug-print-function ${FUNCNAME} "${@}" - if [[ ! "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then - local ABI=${MULTIBUILD_VARIANT} - multilib_toolchain_setup "${ABI}" - export FC="$(tc-getFC) $(get_abi_CFLAGS)" - export F77="$(tc-getF77) $(get_abi_CFLAGS)" - fi + local ABI="${MULTIBUILD_VARIANT/_${INT64_SUFFIX}/}" + multilib_toolchain_setup "${ABI}" + export FC="$(tc-getFC) $(get_abi_CFLAGS)" + export F77="$(tc-getF77) $(get_abi_CFLAGS)" "${@}" } @@ -191,7 +193,7 @@ src_test() { src_install() { local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) ) - my_src_install () { + my_src_install() { local openblas_flags=$(get_openblas_flags) local profname=$(get_profname) local pcfile