commit: b1c7f5cebcfe53d2aac89ff85b8f1ed698f6eec7 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Thu May 26 21:18:09 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Thu May 26 21:20:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=b1c7f5ce
sci-libs/superlu_dist: update SRC_URI Closes: https://bugs.gentoo.org/847358 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> sci-libs/superlu_dist/Manifest | 2 +- .../files/superlu_dist-8.0.0_p20220526-fortran.patch | 14 ++++++++++++++ sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild | 15 +++++---------- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/sci-libs/superlu_dist/Manifest b/sci-libs/superlu_dist/Manifest index 5cbefaa65..a2a6953f4 100644 --- a/sci-libs/superlu_dist/Manifest +++ b/sci-libs/superlu_dist/Manifest @@ -1 +1 @@ -DIST superlu_dist-8.0.0_p20220526.tar.gz 2293227 BLAKE2B 5c73d68a1d9812063614fb503a99c5f1e141d7c4340c1b484e5c24b818c47a6ffc2073140fc585e11b3d5b342d0baa6299ebeface03e2d1eb30245043d214751 SHA512 ac5f03b7f2500f306277dabda9e1aea457b55f2d41b72b969fa4e3a986ebb6abb65f87a3678d6cc103faa8f8e720aaac2b79d9db150288bfe1385abe2b61d8ce +DIST superlu_dist-8.0.0_p20220526.tar.gz 2293062 BLAKE2B 34c2d1d4bc8c6ac0b2285457b81d3d6fff449c31689130eb8a4844ff8ceee9f1d7c21a19632a2dd01a13fc07e6614c02934a2c6f4f3d3808352c82d44aa2bc6c SHA512 e8724b05156fcad2b347643dcbdb6a4183b6b36c4d54f4a9f14e4527f0a62fc5eb76f649909773d770f729fe1a33879bef54581fc0faee54224a67f2e1b8b9c5 diff --git a/sci-libs/superlu_dist/files/superlu_dist-8.0.0_p20220526-fortran.patch b/sci-libs/superlu_dist/files/superlu_dist-8.0.0_p20220526-fortran.patch new file mode 100644 index 000000000..aaf726183 --- /dev/null +++ b/sci-libs/superlu_dist/files/superlu_dist-8.0.0_p20220526-fortran.patch @@ -0,0 +1,14 @@ +--- a/FORTRAN/CMakeLists.txt ++++ b/FORTRAN/CMakeLists.txt +@@ -15,8 +15,9 @@ + list(APPEND sources c2f_zcreate_matrix_x_b.c superlu_c2f_zwrap.c) + endif() + +-add_library(superlu_dist_fortran ${sources}) +-add_library(superlu_dist_fortran-static STATIC ${sources}) ++add_library(superlu_dist_fortran_obj OBJECT ${sources}) ++add_library(superlu_dist_fortran $<TARGET_OBJECTS:superlu_dist_fortran_obj>) ++add_library(superlu_dist_fortran-static STATIC $<TARGET_OBJECTS:superlu_dist_fortran_obj>) + # set(targets superlu_dist_fortran) + get_target_property(superlu_dist_version superlu_dist VERSION) + get_target_property(superlu_dist_soversion superlu_dist SOVERSION) diff --git a/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild b/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild index 7c67699d0..018291878 100644 --- a/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild +++ b/sci-libs/superlu_dist/superlu_dist-8.0.0_p20220526.ebuild @@ -3,7 +3,7 @@ EAPI=8 -COMMIT="df1dbf3afd7876644ff5d0613dfa7b9d32af79de" +COMMIT="a841c9be1666056b2a6b720d27161aa244b562b1" DOCS_BUILDER="doxygen" DOCS_CONFIG_NAME="DoxyConfig" FORTRAN_NEEDED="fortran" @@ -41,7 +41,10 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig" -PATCHES=( "${FILESDIR}/${P}-system-colamd.patch" ) +PATCHES=( + "${FILESDIR}/${P}-system-colamd.patch" + "${FILESDIR}/${P}-fortran.patch" +) RESTRICT="!test? ( test )" src_prepare() { @@ -83,11 +86,3 @@ src_configure() { fi cmake_src_configure } - -src_compile() { - if use fortran ; then - MAKEOPTS="-j1" cmake_src_compile - else - cmake_src_compile - fi -}
