commit: 3c59924fe7b52e8283ca758e208a52abb537a347
Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
AuthorDate: Thu Jul 7 16:15:39 2022 +0000
Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com>
CommitDate: Thu Jul 7 16:15:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c59924f
sci-libs/STRUMPACK: use upstream patch
Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com>
...K-6.3.1-r1.ebuild => STRUMPACK-6.3.1-r2.ebuild} | 10 +-------
...TRUMPACK-6.3.1-multilib-was-not-respected.patch | 27 ++++++++++++++++++++++
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r1.ebuild
b/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r2.ebuild
similarity index 91%
rename from sci-libs/STRUMPACK/STRUMPACK-6.3.1-r1.ebuild
rename to sci-libs/STRUMPACK/STRUMPACK-6.3.1-r2.ebuild
index 742f7fc41..7f589b169 100644
--- a/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r1.ebuild
+++ b/sci-libs/STRUMPACK/STRUMPACK-6.3.1-r2.ebuild
@@ -49,15 +49,7 @@ REQUIRED_USE="
# slate? ( mpi )
# magma? ( cuda )
DOCS=( README.md CHANGELOG SUPPORT )
-
-src_prepare() {
- sed \
- -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION
$(get_libdir)|g" \
- -e "s|lib/cmake|$(get_libdir)/cmake|g" \
- -i CMakeLists.txt \
- || die
- cmake_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}-multilib-was-not-respected.patch" )
src_configure() {
use combblas && append-cppflags '-I/usr/include/CombBLAS'
diff --git
a/sci-libs/STRUMPACK/files/STRUMPACK-6.3.1-multilib-was-not-respected.patch
b/sci-libs/STRUMPACK/files/STRUMPACK-6.3.1-multilib-was-not-respected.patch
new file mode 100644
index 000000000..b12ca27f0
--- /dev/null
+++ b/sci-libs/STRUMPACK/files/STRUMPACK-6.3.1-multilib-was-not-respected.patch
@@ -0,0 +1,27 @@
+From f4345f9ef6365d29634e12e42cd9040a1693e600 Mon Sep 17 00:00:00 2001
+From: Pieter Ghysels <pghys...@lbl.gov>
+Date: Fri, 24 Jun 2022 17:17:05 -0700
+Subject: [PATCH] multilib was not respected, see
+ https://github.com/pghysels/STRUMPACK/issues/65
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -28,6 +28,8 @@ include(CheckLibraryExists)
+ # include(CMakePushCheckState)
+ include(CheckCXXSourceCompiles)
+
++include(GNUInstallDirs)
++
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules")
+
+ # figure out Fortran/C name mangling
+@@ -723,7 +725,8 @@ install(FILES
+ DESTINATION include)
+
+ install(TARGETS strumpack EXPORT STRUMPACKTargets
+- LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+
+ # export targets and all
