| 1 |
commit: 1a7d2ff6d7c7473e44b2d76e954a4b279b083a09 |
| 2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 27 16:15:52 2015 +0000 |
| 4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 27 16:15:52 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a7d2ff6 |
| 7 |
|
| 8 |
sci-libs/mkl: Update link flags according to intel's suggestions |
| 9 |
|
| 10 |
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=568826 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.26 |
| 13 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{mkl-11.1.0.080-r1.ebuild => mkl-11.1.0.080-r2.ebuild} | 11 ++++++----- |
| 16 |
.../mkl/{mkl-11.1.1.106.ebuild => mkl-11.1.1.106-r1.ebuild} | 11 ++++++----- |
| 17 |
.../mkl/{mkl-11.1.2.144.ebuild => mkl-11.1.2.144-r1.ebuild} | 11 ++++++----- |
| 18 |
.../mkl/{mkl-11.1.3.174.ebuild => mkl-11.1.3.174-r1.ebuild} | 11 ++++++----- |
| 19 |
.../mkl/{mkl-11.2.0.090.ebuild => mkl-11.2.0.090-r1.ebuild} | 11 ++++++----- |
| 20 |
.../mkl/{mkl-11.2.1.133.ebuild => mkl-11.2.1.133-r1.ebuild} | 11 ++++++----- |
| 21 |
.../mkl/{mkl-11.2.2.164.ebuild => mkl-11.2.2.164-r1.ebuild} | 9 +++++---- |
| 22 |
.../mkl/{mkl-11.2.3.187.ebuild => mkl-11.2.3.187-r1.ebuild} | 9 +++++---- |
| 23 |
8 files changed, 46 insertions(+), 38 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild |
| 26 |
similarity index 92% |
| 27 |
rename from sci-libs/mkl/mkl-11.1.0.080-r1.ebuild |
| 28 |
rename to sci-libs/mkl/mkl-11.1.0.080-r2.ebuild |
| 29 |
index 8b879a7..a3aa36a 100644 |
| 30 |
--- a/sci-libs/mkl/mkl-11.1.0.080-r1.ebuild |
| 31 |
+++ b/sci-libs/mkl/mkl-11.1.0.080-r2.ebuild |
| 32 |
@@ -1,4 +1,4 @@ |
| 33 |
-# Copyright 1999-2014 Gentoo Foundation |
| 34 |
+# Copyright 1999-2015 Gentoo Foundation |
| 35 |
# Distributed under the terms of the GNU General Public License v2 |
| 36 |
# $Id$ |
| 37 |
|
| 38 |
@@ -70,7 +70,8 @@ mkl_prof() { |
| 39 |
bits=_lp64 |
| 40 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 41 |
fi |
| 42 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 43 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 44 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 45 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 46 |
local core="-lmkl_core -Wl,--end-group" |
| 47 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 48 |
@@ -83,7 +84,7 @@ mkl_prof() { |
| 49 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 50 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 51 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 52 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 53 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 54 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 55 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 56 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 57 |
@@ -109,9 +110,9 @@ mkl_prof() { |
| 58 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 59 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 60 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 61 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 62 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 63 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 64 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 65 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 66 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 67 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 68 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 69 |
|
| 70 |
diff --git a/sci-libs/mkl/mkl-11.1.1.106.ebuild b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild |
| 71 |
similarity index 92% |
| 72 |
rename from sci-libs/mkl/mkl-11.1.1.106.ebuild |
| 73 |
rename to sci-libs/mkl/mkl-11.1.1.106-r1.ebuild |
| 74 |
index 4597661..305bd04 100644 |
| 75 |
--- a/sci-libs/mkl/mkl-11.1.1.106.ebuild |
| 76 |
+++ b/sci-libs/mkl/mkl-11.1.1.106-r1.ebuild |
| 77 |
@@ -1,4 +1,4 @@ |
| 78 |
-# Copyright 1999-2014 Gentoo Foundation |
| 79 |
+# Copyright 1999-2015 Gentoo Foundation |
| 80 |
# Distributed under the terms of the GNU General Public License v2 |
| 81 |
# $Id$ |
| 82 |
|
| 83 |
@@ -70,7 +70,8 @@ mkl_prof() { |
| 84 |
bits=_lp64 |
| 85 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 86 |
fi |
| 87 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 88 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 89 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 90 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 91 |
local core="-lmkl_core -Wl,--end-group" |
| 92 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 93 |
@@ -83,7 +84,7 @@ mkl_prof() { |
| 94 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 95 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 96 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 97 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 98 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 99 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 100 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 101 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 102 |
@@ -109,9 +110,9 @@ mkl_prof() { |
| 103 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 104 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 105 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 106 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 107 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 108 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 109 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 110 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 111 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 112 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 113 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 114 |
|
| 115 |
diff --git a/sci-libs/mkl/mkl-11.1.2.144.ebuild b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild |
| 116 |
similarity index 92% |
| 117 |
rename from sci-libs/mkl/mkl-11.1.2.144.ebuild |
| 118 |
rename to sci-libs/mkl/mkl-11.1.2.144-r1.ebuild |
| 119 |
index dfc9397..a02e270 100644 |
| 120 |
--- a/sci-libs/mkl/mkl-11.1.2.144.ebuild |
| 121 |
+++ b/sci-libs/mkl/mkl-11.1.2.144-r1.ebuild |
| 122 |
@@ -1,4 +1,4 @@ |
| 123 |
-# Copyright 1999-2014 Gentoo Foundation |
| 124 |
+# Copyright 1999-2015 Gentoo Foundation |
| 125 |
# Distributed under the terms of the GNU General Public License v2 |
| 126 |
# $Id$ |
| 127 |
|
| 128 |
@@ -70,7 +70,8 @@ mkl_prof() { |
| 129 |
bits=_lp64 |
| 130 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 131 |
fi |
| 132 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 133 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 134 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 135 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 136 |
local core="-lmkl_core -Wl,--end-group" |
| 137 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 138 |
@@ -83,7 +84,7 @@ mkl_prof() { |
| 139 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 140 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 141 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 142 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 143 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 144 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 145 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 146 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 147 |
@@ -109,9 +110,9 @@ mkl_prof() { |
| 148 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 149 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 150 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 151 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 152 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 153 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 154 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 155 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 156 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 157 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 158 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 159 |
|
| 160 |
diff --git a/sci-libs/mkl/mkl-11.1.3.174.ebuild b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild |
| 161 |
similarity index 92% |
| 162 |
rename from sci-libs/mkl/mkl-11.1.3.174.ebuild |
| 163 |
rename to sci-libs/mkl/mkl-11.1.3.174-r1.ebuild |
| 164 |
index 48b7d8d..8bb1117 100644 |
| 165 |
--- a/sci-libs/mkl/mkl-11.1.3.174.ebuild |
| 166 |
+++ b/sci-libs/mkl/mkl-11.1.3.174-r1.ebuild |
| 167 |
@@ -1,4 +1,4 @@ |
| 168 |
-# Copyright 1999-2014 Gentoo Foundation |
| 169 |
+# Copyright 1999-2015 Gentoo Foundation |
| 170 |
# Distributed under the terms of the GNU General Public License v2 |
| 171 |
# $Id$ |
| 172 |
|
| 173 |
@@ -70,7 +70,8 @@ mkl_prof() { |
| 174 |
bits=_lp64 |
| 175 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 176 |
fi |
| 177 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 178 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 179 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 180 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 181 |
local core="-lmkl_core -Wl,--end-group" |
| 182 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 183 |
@@ -83,7 +84,7 @@ mkl_prof() { |
| 184 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 185 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 186 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 187 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 188 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 189 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 190 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 191 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 192 |
@@ -109,9 +110,9 @@ mkl_prof() { |
| 193 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 194 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 195 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 196 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 197 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 198 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 199 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 200 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 201 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 202 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 203 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 204 |
|
| 205 |
diff --git a/sci-libs/mkl/mkl-11.2.0.090.ebuild b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild |
| 206 |
similarity index 92% |
| 207 |
rename from sci-libs/mkl/mkl-11.2.0.090.ebuild |
| 208 |
rename to sci-libs/mkl/mkl-11.2.0.090-r1.ebuild |
| 209 |
index 2197e24..6143bdb 100644 |
| 210 |
--- a/sci-libs/mkl/mkl-11.2.0.090.ebuild |
| 211 |
+++ b/sci-libs/mkl/mkl-11.2.0.090-r1.ebuild |
| 212 |
@@ -1,4 +1,4 @@ |
| 213 |
-# Copyright 1999-2014 Gentoo Foundation |
| 214 |
+# Copyright 1999-2015 Gentoo Foundation |
| 215 |
# Distributed under the terms of the GNU General Public License v2 |
| 216 |
# $Id$ |
| 217 |
|
| 218 |
@@ -70,7 +70,8 @@ mkl_prof() { |
| 219 |
bits=_lp64 |
| 220 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 221 |
fi |
| 222 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 223 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 224 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 225 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 226 |
local core="-lmkl_core -Wl,--end-group" |
| 227 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 228 |
@@ -83,7 +84,7 @@ mkl_prof() { |
| 229 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 230 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 231 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 232 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 233 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 234 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 235 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 236 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 237 |
@@ -109,9 +110,9 @@ mkl_prof() { |
| 238 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 239 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 240 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 241 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 242 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 243 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 244 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 245 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 246 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 247 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 248 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 249 |
|
| 250 |
diff --git a/sci-libs/mkl/mkl-11.2.1.133.ebuild b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild |
| 251 |
similarity index 92% |
| 252 |
rename from sci-libs/mkl/mkl-11.2.1.133.ebuild |
| 253 |
rename to sci-libs/mkl/mkl-11.2.1.133-r1.ebuild |
| 254 |
index 8899ce5..6b1187a 100644 |
| 255 |
--- a/sci-libs/mkl/mkl-11.2.1.133.ebuild |
| 256 |
+++ b/sci-libs/mkl/mkl-11.2.1.133-r1.ebuild |
| 257 |
@@ -1,4 +1,4 @@ |
| 258 |
-# Copyright 1999-2014 Gentoo Foundation |
| 259 |
+# Copyright 1999-2015 Gentoo Foundation |
| 260 |
# Distributed under the terms of the GNU General Public License v2 |
| 261 |
# $Id$ |
| 262 |
|
| 263 |
@@ -72,7 +72,8 @@ mkl_prof() { |
| 264 |
bits=_lp64 |
| 265 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 266 |
fi |
| 267 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 268 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 269 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 270 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 271 |
local core="-lmkl_core -Wl,--end-group" |
| 272 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 273 |
@@ -85,7 +86,7 @@ mkl_prof() { |
| 274 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 275 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 276 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 277 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 278 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 279 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 280 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 281 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 282 |
@@ -111,9 +112,9 @@ mkl_prof() { |
| 283 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 284 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 285 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 286 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 287 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 288 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 289 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 290 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 291 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 292 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 293 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 294 |
|
| 295 |
diff --git a/sci-libs/mkl/mkl-11.2.2.164.ebuild b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild |
| 296 |
similarity index 93% |
| 297 |
rename from sci-libs/mkl/mkl-11.2.2.164.ebuild |
| 298 |
rename to sci-libs/mkl/mkl-11.2.2.164-r1.ebuild |
| 299 |
index 8ead60b..c8281f3 100644 |
| 300 |
--- a/sci-libs/mkl/mkl-11.2.2.164.ebuild |
| 301 |
+++ b/sci-libs/mkl/mkl-11.2.2.164-r1.ebuild |
| 302 |
@@ -72,7 +72,8 @@ mkl_prof() { |
| 303 |
bits=_lp64 |
| 304 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 305 |
fi |
| 306 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 307 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 308 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 309 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 310 |
local core="-lmkl_core -Wl,--end-group" |
| 311 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 312 |
@@ -85,7 +86,7 @@ mkl_prof() { |
| 313 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 314 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 315 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 316 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 317 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 318 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 319 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 320 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 321 |
@@ -111,9 +112,9 @@ mkl_prof() { |
| 322 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 323 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 324 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 325 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 326 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 327 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 328 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 329 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 330 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 331 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 332 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
| 333 |
|
| 334 |
diff --git a/sci-libs/mkl/mkl-11.2.3.187.ebuild b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild |
| 335 |
similarity index 93% |
| 336 |
rename from sci-libs/mkl/mkl-11.2.3.187.ebuild |
| 337 |
rename to sci-libs/mkl/mkl-11.2.3.187-r1.ebuild |
| 338 |
index 66b8ce6..77a85b5 100644 |
| 339 |
--- a/sci-libs/mkl/mkl-11.2.3.187.ebuild |
| 340 |
+++ b/sci-libs/mkl/mkl-11.2.3.187-r1.ebuild |
| 341 |
@@ -72,7 +72,8 @@ mkl_prof() { |
| 342 |
bits=_lp64 |
| 343 |
[[ ${1} == int64 ]] && bits=_ilp64 |
| 344 |
fi |
| 345 |
- local gf="-Wl,--start-group -lmkl_gf${bits}" |
| 346 |
+ local gf="-Wl,--no-as-needed -Wl,--start-group -lmkl_gf${bits}" |
| 347 |
+ local gc="-Wl,--no-as-needed -Wl,--start-group -lmkl_intel${bits}" |
| 348 |
local intel="-Wl,--start-group -lmkl_intel${bits}" |
| 349 |
local core="-lmkl_core -Wl,--end-group" |
| 350 |
local prof=mkl${IARCH:((${#IARCH} - 2)):2} |
| 351 |
@@ -85,7 +86,7 @@ mkl_prof() { |
| 352 |
mkl_add_prof ${prof}-intel blas lapack cblas lapacke |
| 353 |
libs="${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 354 |
mkl_add_prof ${prof}-gfortran-openmp blas lapack |
| 355 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 356 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 357 |
mkl_add_prof ${prof}-gcc-openmp cblas lapacke |
| 358 |
libs="${intel} -lmkl_intel_thread ${core} -openmp -lpthread" \ |
| 359 |
mkl_add_prof ${prof}-intel-openmp blas lapack cblas lapacke |
| 360 |
@@ -111,9 +112,9 @@ mkl_prof() { |
| 361 |
mkl_add_prof ${prof}-gfortran-openmp-blacs blacs |
| 362 |
libs="${scal} ${gf} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 363 |
mkl_add_prof ${prof}-gfortran-openmp-scalapack scalapack |
| 364 |
- libs="${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 365 |
+ libs="${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 366 |
mkl_add_prof ${prof}-gcc-openmp-blacs blacs |
| 367 |
- libs="${scal} ${intel} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 368 |
+ libs="${scal} ${gc} -lmkl_gnu_thread ${core} -fopenmp -lpthread" \ |
| 369 |
mkl_add_prof ${prof}-gcc-openmp-scalapack scalapack |
| 370 |
libs="${intel} -lmkl_intel_thread ${core} -liomp5 -lpthread" \ |
| 371 |
mkl_add_prof ${prof}-intel-openmp-blacs blacs |
Archives