sci-libs/STRUMPACK: use upstream patch

Signed-off-by: Alessandro Barbieri <lssndrbarbieri@gmail.com>
This commit is contained in:
Alessandro Barbieri
2022-07-07 18:15:39 +02:00
parent 171d97cb3d
commit 3c59924fe7
2 changed files with 28 additions and 9 deletions

View File

@@ -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'

View File

@@ -0,0 +1,27 @@
From f4345f9ef6365d29634e12e42cd9040a1693e600 Mon Sep 17 00:00:00 2001
From: Pieter Ghysels <pghysels@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