| 1 |
commit: 40003409ab4ef64801ed5422f8f3c23fb0029ffd |
| 2 |
Author: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 19:21:22 2016 +0000 |
| 4 |
Commit: Christoph Junghans <ottxor <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 19:21:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40003409 |
| 7 |
|
| 8 |
sci-chemistry/gromacs: fix build with mkl (bug #592786) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
sci-chemistry/gromacs/gromacs-2016.9999.ebuild | 8 +++++++- |
| 13 |
sci-chemistry/gromacs/gromacs-2016.ebuild | 8 +++++++- |
| 14 |
2 files changed, 14 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-chemistry/gromacs/gromacs-2016.9999.ebuild b/sci-chemistry/gromacs/gromacs-2016.9999.ebuild |
| 17 |
index c4a1a0a..e5f17d7 100644 |
| 18 |
--- a/sci-chemistry/gromacs/gromacs-2016.9999.ebuild |
| 19 |
+++ b/sci-chemistry/gromacs/gromacs-2016.9999.ebuild |
| 20 |
@@ -137,12 +137,18 @@ src_configure() { |
| 21 |
-DMKL_INCLUDE_DIR="${MKLROOT}/include" |
| 22 |
-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)" |
| 23 |
) |
| 24 |
- elif use mkl; then |
| 25 |
+ elif use mkl && has_version "<sci-libs/mkl-11.3"; then |
| 26 |
local bits=$(get_libdir) |
| 27 |
fft_opts=( -DGMX_FFT_LIBRARY=mkl |
| 28 |
-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)" |
| 29 |
-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)" |
| 30 |
) |
| 31 |
+ elif use mkl; then |
| 32 |
+ local bits=$(get_libdir) |
| 33 |
+ fft_opts=( -DGMX_FFT_LIBRARY=mkl |
| 34 |
+ -DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)" |
| 35 |
+ -DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)" |
| 36 |
+ ) |
| 37 |
else |
| 38 |
fft_opts=( -DGMX_FFT_LIBRARY=fftpack ) |
| 39 |
fi |
| 40 |
|
| 41 |
diff --git a/sci-chemistry/gromacs/gromacs-2016.ebuild b/sci-chemistry/gromacs/gromacs-2016.ebuild |
| 42 |
index c93c507..9987af8 100644 |
| 43 |
--- a/sci-chemistry/gromacs/gromacs-2016.ebuild |
| 44 |
+++ b/sci-chemistry/gromacs/gromacs-2016.ebuild |
| 45 |
@@ -135,12 +135,18 @@ src_configure() { |
| 46 |
-DMKL_INCLUDE_DIR="${MKLROOT}/include" |
| 47 |
-DMKL_LIBRARIES="$(echo /opt/intel/mkl/10.0.5.025/lib/*/libmkl.so);$(echo /opt/intel/mkl/10.0.5.025/lib/*/libiomp*.so)" |
| 48 |
) |
| 49 |
- elif use mkl; then |
| 50 |
+ elif use mkl && has_version "<sci-libs/mkl-11.3"; then |
| 51 |
local bits=$(get_libdir) |
| 52 |
fft_opts=( -DGMX_FFT_LIBRARY=mkl |
| 53 |
-DMKL_INCLUDE_DIR="$(echo /opt/intel/*/mkl/include)" |
| 54 |
-DMKL_LIBRARIES="$(echo /opt/intel/*/mkl/lib/*${bits/lib}/libmkl_rt.so)" |
| 55 |
) |
| 56 |
+ elif use mkl; then |
| 57 |
+ local bits=$(get_libdir) |
| 58 |
+ fft_opts=( -DGMX_FFT_LIBRARY=mkl |
| 59 |
+ -DMKL_INCLUDE_DIR="$(echo /opt/intel/*/linux/mkl/include)" |
| 60 |
+ -DMKL_LIBRARIES="$(echo /opt/intel/*/linux/mkl/lib/*${bits/lib}/libmkl_rt.so)" |
| 61 |
+ ) |
| 62 |
else |
| 63 |
fft_opts=( -DGMX_FFT_LIBRARY=fftpack ) |
| 64 |
fi |
Archives