From f701a24704596a8feae7cd4e201bdfb29142775c Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 26 Dec 2022 13:54:07 +0100 Subject: [PATCH] superlu,bump version (#7664) --- .../superlu/patches/superlu-5.2.1.patchset | 25 --------- ...erlu-5.2.1.recipe => superlu-5.3.0.recipe} | 52 +++++++++++-------- 2 files changed, 29 insertions(+), 48 deletions(-) delete mode 100644 sci-libs/superlu/patches/superlu-5.2.1.patchset rename sci-libs/superlu/{superlu-5.2.1.recipe => superlu-5.3.0.recipe} (68%) diff --git a/sci-libs/superlu/patches/superlu-5.2.1.patchset b/sci-libs/superlu/patches/superlu-5.2.1.patchset deleted file mode 100644 index 24b123df5..000000000 --- a/sci-libs/superlu/patches/superlu-5.2.1.patchset +++ /dev/null @@ -1,25 +0,0 @@ -From 1b128432e354b8d9277872f7679c1ac439cb781b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Sun, 13 Nov 2016 03:15:05 +0100 -Subject: Disable Fortran support for now - -We don't really build gcc with the fortran frontend yet... - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e79ad41..3455ab7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,8 +39,8 @@ else() - endif() - - enable_language(C) --enable_language (Fortran) --set(NOFORTRAN FALSE) -+#enable_language (Fortran) -+#set(NOFORTRAN FALSE) - set(SUPERLU_VERSION "${PROJECT_VERSION}") - set(SUPERLU_REV "${PROJECT_REV}") - --- -2.7.0 - diff --git a/sci-libs/superlu/superlu-5.2.1.recipe b/sci-libs/superlu/superlu-5.3.0.recipe similarity index 68% rename from sci-libs/superlu/superlu-5.2.1.recipe rename to sci-libs/superlu/superlu-5.3.0.recipe index 72df4acab..15662326c 100644 --- a/sci-libs/superlu/superlu-5.2.1.recipe +++ b/sci-libs/superlu/superlu-5.3.0.recipe @@ -16,30 +16,34 @@ to equilibrate the system, estimate the condition number, calculate the \ relative backward error, and estimate error bounds for the refined solutions. \ Serial SuperLU package also contains ILU routines, using numerical \ threshold-based dropping, with partial pivoting (ILUTP)." -HOMEPAGE="https://crd.lbl.gov/~xiaoye/SuperLU/" +HOMEPAGE="https://crd.lbl.gov/~xiaoye/SuperLU/ + https://github.com/xiaoyeli/superlu" COPYRIGHT="2003 The Regents of the University of California" LICENSE="BSD (3-clause)" # TODO: see "External software" in License.txt -REVISION="3" -SOURCE_URI="http://crd-legacy.lbl.gov/~xiaoye/SuperLU/superlu_5.2.1.tar.gz" -CHECKSUM_SHA256="28fb66d6107ee66248d5cf508c79de03d0621852a0ddeba7301801d3d859f463" -SOURCE_DIR="SuperLU_$portVersion" -PATCHES="superlu-$portVersion.patchset" +REVISION="1" +SOURCE_URI="https://github.com/xiaoyeli/superlu/archive/refs/tags/v$portVersion.tar.gz" +CHECKSUM_SHA256="3e464afa77335de200aeb739074a11e96d9bef6d0b519950cfa6684c4be1f350" +SOURCE_FILENAME="superlu-v$portVersion.tar.gz" ARCHITECTURES="all !x86_gcc2" -SECONDARY_ARCHITECTURES="!x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86" + +libVersion="$portVersion" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" superlu$secondaryArchSuffix = $portVersion - lib:libsuperlu$secondaryArchSuffix = 5.2.1 compat >= 5 + lib:libsuperlu$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku$secondaryArchSuffix + lib:libopenblas$secondaryArchSuffix " PROVIDES_devel=" superlu${secondaryArchSuffix}_devel = $portVersion - devel:libsuperlu$secondaryArchSuffix = 5.2.1 compat >= 5 + devel:libsuperlu$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" superlu$secondaryArchSuffix == $portVersion base @@ -47,35 +51,37 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel + devel:libopenblas$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake cmd:g++$secondaryArchSuffix - #cmd:gfortran + cmd:gfortran$secondaryArchSuffix cmd:make " BUILD() { - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$prefix \ - -DCMAKE_INSTALL_NAME_DIR=$libDir \ - -DCMAKE_INSTALL_LIBDIR=$libDir \ - -DCMAKE_INSTALL_INCLUDEDIR=$includeDir \ - -#TODO: use shared lib, but it seems to also build libblas.so but not install it -# -DBUILD_SHARED_LIBS=TRUE - make $jobArgs + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ + $cmakeDirArgs \ + -Denable_internal_blaslib=OFF \ + -DBUILD_SHARED_LIBS=TRUE + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install prepareInstalledDevelLib libsuperlu + fixPkgconfig packageEntries devel \ - $developDir + $developDir \ + $libDir/cmake +} + +TEST() +{ + make -C build test }