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 9DFD61384B4 for ; Sun, 27 Dec 2015 16:20:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A31D2E07FD; Sun, 27 Dec 2015 16:19:59 +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 E6CB3E079B for ; Sun, 27 Dec 2015 16:19:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDEED340753 for ; Sun, 27 Dec 2015 16:19:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 473D6CEE for ; Sun, 27 Dec 2015 16:19:55 +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: <1451232952.1a7d2ff6d7c7473e44b2d76e954a4b279b083a09.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-libs/mkl/ X-VCS-Repository: proj/sci X-VCS-Files: sci-libs/mkl/mkl-11.1.0.080-r1.ebuild sci-libs/mkl/mkl-11.1.0.080-r2.ebuild sci-libs/mkl/mkl-11.1.1.106-r1.ebuild sci-libs/mkl/mkl-11.1.1.106.ebuild sci-libs/mkl/mkl-11.1.2.144-r1.ebuild sci-libs/mkl/mkl-11.1.2.144.ebuild sci-libs/mkl/mkl-11.1.3.174-r1.ebuild sci-libs/mkl/mkl-11.1.3.174.ebuild sci-libs/mkl/mkl-11.2.0.090-r1.ebuild sci-libs/mkl/mkl-11.2.0.090.ebuild sci-libs/mkl/mkl-11.2.1.133-r1.ebuild sci-libs/mkl/mkl-11.2.1.133.ebuild sci-libs/mkl/mkl-11.2.2.164-r1.ebuild sci-libs/mkl/mkl-11.2.2.164.ebuild sci-libs/mkl/mkl-11.2.3.187-r1.ebuild sci-libs/mkl/mkl-11.2.3.187.ebuild X-VCS-Directories: sci-libs/mkl/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 1a7d2ff6d7c7473e44b2d76e954a4b279b083a09 X-VCS-Branch: master Date: Sun, 27 Dec 2015 16:19:55 +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: 29bf0104-9450-4428-9d37-87ad2c92eb67 X-Archives-Hash: 9a7bc8cfe337e92d022612751a2cc02d commit: 1a7d2ff6d7c7473e44b2d76e954a4b279b083a09 Author: Justin Lecher gentoo org> AuthorDate: Sun Dec 27 16:15:52 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Sun Dec 27 16:15:52 2015 +0000 URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a7d2ff6 sci-libs/mkl: Update link flags according to intel's suggestions Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568826 Package-Manager: portage-2.2.26 Signed-off-by: Justin Lecher gentoo.org> .../{mkl-11.1.0.080-r1.ebuild => mkl-11.1.0.080-r2.ebuild} | 11 ++++++----- .../mkl/{mkl-11.1.1.106.ebuild => mkl-11.1.1.106-r1.ebuild} | 11 ++++++----- .../mkl/{mkl-11.1.2.144.ebuild => mkl-11.1.2.144-r1.ebuild} | 11 ++++++----- .../mkl/{mkl-11.1.3.174.ebuild => mkl-11.1.3.174-r1.ebuild} | 11 ++++++----- .../mkl/{mkl-11.2.0.090.ebuild => mkl-11.2.0.090-r1.ebuild} | 11 ++++++----- .../mkl/{mkl-11.2.1.133.ebuild => mkl-11.2.1.133-r1.ebuild} | 11 ++++++----- .../mkl/{mkl-11.2.2.164.ebuild => mkl-11.2.2.164-r1.ebuild} | 9 +++++---- .../mkl/{mkl-11.2.3.187.ebuild => mkl-11.2.3.187-r1.ebuild} | 9 +++++---- 8 files changed, 46 insertions(+), 38 deletions(-) diff --git a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild similarity index 92% rename from sci-libs/mkl/mkl-11.1.0.080-r1.ebuild rename to sci-libs/mkl/mkl-11.1.0.080-r2.ebuild index 8b879a7..a3aa36a 100644 --- a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild +++ b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -83,7 +84,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -109,9 +110,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.1.1.106.ebuild b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild similarity index 92% rename from sci-libs/mkl/mkl-11.1.1.106.ebuild rename to sci-libs/mkl/mkl-11.1.1.106-r1.ebuild index 4597661..305bd04 100644 --- a/sci-libs/mkl/mkl-11.1.1.106.ebuild +++ b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -83,7 +84,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -109,9 +110,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.1.2.144.ebuild b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild similarity index 92% rename from sci-libs/mkl/mkl-11.1.2.144.ebuild rename to sci-libs/mkl/mkl-11.1.2.144-r1.ebuild index dfc9397..a02e270 100644 --- a/sci-libs/mkl/mkl-11.1.2.144.ebuild +++ b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -83,7 +84,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -109,9 +110,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.1.3.174.ebuild b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild similarity index 92% rename from sci-libs/mkl/mkl-11.1.3.174.ebuild rename to sci-libs/mkl/mkl-11.1.3.174-r1.ebuild index 48b7d8d..8bb1117 100644 --- a/sci-libs/mkl/mkl-11.1.3.174.ebuild +++ b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -83,7 +84,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -109,9 +110,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.2.0.090.ebuild b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild similarity index 92% rename from sci-libs/mkl/mkl-11.2.0.090.ebuild rename to sci-libs/mkl/mkl-11.2.0.090-r1.ebuild index 2197e24..6143bdb 100644 --- a/sci-libs/mkl/mkl-11.2.0.090.ebuild +++ b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -70,7 +70,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -83,7 +84,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -109,9 +110,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.2.1.133.ebuild b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild similarity index 92% rename from sci-libs/mkl/mkl-11.2.1.133.ebuild rename to sci-libs/mkl/mkl-11.2.1.133-r1.ebuild index 8899ce5..6b1187a 100644 --- a/sci-libs/mkl/mkl-11.2.1.133.ebuild +++ b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -72,7 +72,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -85,7 +86,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -111,9 +112,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.2.2.164.ebuild b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild similarity index 93% rename from sci-libs/mkl/mkl-11.2.2.164.ebuild rename to sci-libs/mkl/mkl-11.2.2.164-r1.ebuild index 8ead60b..c8281f3 100644 --- a/sci-libs/mkl/mkl-11.2.2.164.ebuild +++ b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild @@ -72,7 +72,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -85,7 +86,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -111,9 +112,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs diff --git a/sci-libs/mkl/mkl-11.2.3.187.ebuild b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild similarity index 93% rename from sci-libs/mkl/mkl-11.2.3.187.ebuild rename to sci-libs/mkl/mkl-11.2.3.187-r1.ebuild index 66b8ce6..77a85b5 100644 --- a/sci-libs/mkl/mkl-11.2.3.187.ebuild +++ b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild @@ -72,7 +72,8 @@ mkl_prof() { bits=_lp64 [[ ${1} == int64 ]] && bits=_ilp64 fi - local gf="-Wl,--start-group -lmkl_gf${bits}" + local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" + local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" local intel="-Wl,--start-group -lmkl_intel${bits}" local core="-lmkl_core -Wl,--end-group" local prof=mkl${IARCH:((${#IARCH} - 2)):2} @@ -85,7 +86,7 @@ mkl_prof() { mkl_add_prof ${prof}-intel blas lapack cblas lapacke libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp blas lapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp cblas lapacke libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke @@ -111,9 +112,9 @@ mkl_prof() { mkl_add_prof ${prof}-gfortran-openmp-blacs blacs libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack - libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-blacs blacs - libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ + libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ mkl_add_prof ${prof}-intel-openmp-blacs blacs