commit: beb6c45e8ef0cf87a89011e9ca1cd44d850a36e5 Author: gienah <gienah <AT> gentoo <DOT> org> AuthorDate: Mon Oct 20 12:31:36 2014 +0000 Commit: Justin Lecher <jlec <AT> gentoo <DOT> 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 <gie...@gentoo.org> 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 <gie...@gentoo.org> 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}" }