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 ABC6B138826 for ; Mon, 20 Oct 2014 18:01:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5B44E084B; Mon, 20 Oct 2014 18:01:18 +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 23EECE085E for ; Mon, 20 Oct 2014 18:01:18 +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 1493A33BDBD for ; Mon, 20 Oct 2014 18:01:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9D68D855B for ; Mon, 20 Oct 2014 18:01:15 +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: <1413808494.beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/openblas/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/openblas/ChangeLog 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: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5 X-VCS-Branch: master Date: Mon, 20 Oct 2014 18:01:15 +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: 51fbd911-cfe8-4fd3-aa9a-7617efadada6 X-Archives-Hash: 64e7f2ab8ef5778a93703e143e82a497 commit: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5 Author: gienah gentoo org> AuthorDate: Mon Oct 20 12:31:36 2014 +0000 Commit: Justin Lecher gentoo org> CommitDate: Mon Oct 20 12:34:54 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=beb6c45e Thanks to kiwifb for reporting https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy between installed libraries and .pc file. --- sci-libs/openblas/ChangeLog | 5 +++++ sci-libs/openblas/openblas-9999.ebuild | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sci-libs/openblas/ChangeLog b/sci-libs/openblas/ChangeLog index cc7349a..fee0835 100644 --- a/sci-libs/openblas/ChangeLog +++ b/sci-libs/openblas/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 20 Oct 2014; Mark Wright openblas-9999.ebuild: + Thanks to kiwifb for reporting + https://github.com/gentoo-science/sci/issues/280 - Fix openblas: discrepancy + between installed libraries and .pc file. + 19 Oct 2014; Mark Wright openblas-9999.ebuild: The fix for Bug 524612 failed in src_install building openblas from git. The fix is to move applying the patch to src_compile after building the library, diff --git a/sci-libs/openblas/openblas-9999.ebuild b/sci-libs/openblas/openblas-9999.ebuild index 7c22ca6..a532fe8 100644 --- a/sci-libs/openblas/openblas-9999.ebuild +++ b/sci-libs/openblas/openblas-9999.ebuild @@ -42,7 +42,7 @@ get_openblas_flags() { use dynamic && \ openblas_flags+=" DYNAMIC_ARCH=1 TARGET=GENERIC NUM_THREADS=64 NO_AFFINITY=1" $(fortran-int64_is_int64_build) && \ - openblas_flags+=" INTERFACE64=1 LIBNAMESUFFIX=${INT64_SUFFIX}" + openblas_flags+=" INTERFACE64=1" # choose posix threads over openmp when the two are set # yet to see the need of having the two profiles simultaneously if use threads; then @@ -50,6 +50,13 @@ get_openblas_flags() { elif use openmp; then openblas_flags+=" USE_THREAD=0 USE_OPENMP=1" fi + local profname=$(fortran-int64_get_profname) + local libname="${profname//-/_}" + local underscoresuffix="${libname#${PN}}" + if [[ "${underscoresuffix}" != "_" ]]; then + local libnamesuffix="${underscoresuffix#_}" + openblas_flags+=" LIBNAMESUFFIX=${libnamesuffix}" + fi echo "${openblas_flags}" }