sci-libs/scalapack: Fix libdir install paths

Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

diff --git a/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
new file mode 100644 (file)
index 0000000..a1604a8
--- /dev/null
+++ b/sci-libs/scalapack/files/scalapack-2.0.2-libdir.patch
@@ -0,0 +1,45 @@
+--- a/CMakeLists.txt   2012-05-02 05:58:24.000000000 +0200
++++ b/CMakeLists.txt   2018-10-15 23:57:22.716171671 +0200
+@@ -101,8 +101,8 @@
+ # Organize output files.  On Windows this also keeps .dll files next
+ # to the .exe files that need them, making tests easy to run.
+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/TESTING)
+-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
+-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib)
++set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
++set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX})
+ 
+ # --------------------------------------------------
+ # Check for any necessary platform specific compiler flags
+@@ -163,8 +163,8 @@
+         PREFIX ${SCALAPACK_BINARY_DIR}/dependencies
+       )
+         if (UNIX)
+-         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.a CACHE STRING "LAPACK library" FORCE)
+-         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.a CACHE STRING "BLAS library" FORCE)
++         SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/liblapack.a CACHE STRING "LAPACK library" FORCE)
++         SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib${LIB_SUFFIX}/libblas.a CACHE STRING "BLAS library" FORCE)
+         else (UNIX) # On Windows
+          SET(LAPACK_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/liblapack.lib CACHE STRING "LAPACK library" FORCE)
+          SET(BLAS_LIBRARIES ${SCALAPACK_BINARY_DIR}/lib/libblas.lib CACHE STRING "BLAS library" FORCE)
+@@ -283,7 +283,7 @@
+ if( NOT LAPACK_FOUND )
+  install(FILES
+   ${BLAS_LIBRARIES} ${LAPACK_LIBRARIES}
+-  DESTINATION lib
++  DESTINATION lib${LIB_SUFFIX}
+    )
+ endif( NOT LAPACK_FOUND )
+ 
+@@ -303,9 +303,9 @@
+ install(FILES
+   ${SCALAPACK_BINARY_DIR}/CMakeFiles/scalapack-config.cmake
+   ${SCALAPACK_BINARY_DIR}/scalapack-config-version.cmake
+-  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION}
++  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION}
+   )
+ 
+ install(EXPORT scalapack-targets
+-  DESTINATION lib/cmake/scalapack-${SCALAPACK_VERSION})
++  DESTINATION lib${LIB_SUFFIX}/cmake/scalapack-${SCALAPACK_VERSION})
+ 

diff --git a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
index f520036f536a0d1167fd534933d57db80861b235..3e60e55da8f2171038b9aac907166bbf9771d8c3 100644 (file)
--- a/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
+++ b/sci-libs/scalapack/scalapack-2.0.2-r1.ebuild
@@ -20,6 +20,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
        virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-libdir.patch" )
+
 src_prepare() {
        cmake-utils_src_prepare