| 1 |
commit: 0fad5bca0107d7ef03ecde354bed71bc50bd7dc0 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Oct 15 22:06:07 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Oct 15 22:07:24 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fad5bca |
| 7 |
|
| 8 |
sci-libs/scalapack: Fix libdir install paths |
| 9 |
|
| 10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
| 12 |
|
| 13 |
.../scalapack/files/scalapack-2.0.2-libdir.patch | 45 ++++++++++++++++++++++ |
| 14 |
sci-libs/scalapack/scalapack-2.0.2-r1.ebuild | 2 + |
| 15 |
2 files changed, 47 insertions(+) |
| 16 |
|
| 17 |
diff --git a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..a1604a8fd85 |
| 20 |
--- /dev/null |
| 21 |
+++ b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch |
| 22 |
@@ -0,0 +1,45 @@ |
| 23 |
+--- a/CMakeLists.txt 2012-05-02 05:58:24.000000000 +0200 |
| 24 |
++++ b/CMakeLists.txt 2018-10-15 23:57:22.716171671 +0200 |
| 25 |
+@@ -101,8 +101,8 @@ |
| 26 |
+ # Organize output files. On Windows this also keeps .dll files next |
| 27 |
+ # to the .exe files that need them, making tests easy to run. |
| 28 |
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING) |
| 29 |
+-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib) |
| 30 |
+-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib) |
| 31 |
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}) |
| 32 |
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}) |
| 33 |
+ |
| 34 |
+ # -------------------------------------------------- |
| 35 |
+ # Check for any necessary platform specific compiler flags |
| 36 |
+@@ -163,8 +163,8 @@ |
| 37 |
+ PREFIX ${SCALAPACK_BINARY_DIR}/dependencies |
| 38 |
+ ) |
| 39 |
+ if (UNIX) |
| 40 |
+- SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.a CACHE STRING "LAPACK library" FORCE) |
| 41 |
+- SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.a CACHE STRING "BLAS library" FORCE) |
| 42 |
++ SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/liblapack.a CACHE STRING "LAPACK library" FORCE) |
| 43 |
++ SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/libblas.a CACHE STRING "BLAS library" FORCE) |
| 44 |
+ else (UNIX) # On Windows |
| 45 |
+ SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.lib CACHE STRING "LAPACK library" FORCE) |
| 46 |
+ SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.lib CACHE STRING "BLAS library" FORCE) |
| 47 |
+@@ -283,7 +283,7 @@ |
| 48 |
+ if( NOT LAPACK_FOUND ) |
| 49 |
+ install(FILES |
| 50 |
+ ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES} |
| 51 |
+- DESTINATION lib |
| 52 |
++ DESTINATION lib${LIB_SUFFIX} |
| 53 |
+ ) |
| 54 |
+ endif( NOT LAPACK_FOUND ) |
| 55 |
+ |
| 56 |
+@@ -303,9 +303,9 @@ |
| 57 |
+ install(FILES |
| 58 |
+ ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake |
| 59 |
+ ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake |
| 60 |
+- DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION} |
| 61 |
++ DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION} |
| 62 |
+ ) |
| 63 |
+ |
| 64 |
+ install(EXPORT scalapack-targets |
| 65 |
+- DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION}) |
| 66 |
++ DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION}) |
| 67 |
+ |
| 68 |
|
| 69 |
diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild |
| 70 |
index f520036f536..3e60e55da8f 100644 |
| 71 |
--- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild |
| 72 |
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild |
| 73 |
@@ -20,6 +20,8 @@ RDEPEND=" |
| 74 |
DEPEND="${RDEPEND} |
| 75 |
virtual/pkgconfig" |
| 76 |
|
| 77 |
+PATCHES=( "${FILESDIR}/${P}-libdir.patch" ) |
| 78 |
+ |
| 79 |
src_prepare() { |
| 80 |
cmake-utils_src_prepare |
Archives