commit:     1a7d2ff6d7c7473e44b2d76e954a4b279b083a09
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 16:15:52 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> 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 <jlec <AT> 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

Reply via email to