diff --git a/SuperLU.spec b/SuperLU.spec index e7e0dbf..46eaa06 100644 --- a/SuperLU.spec +++ b/SuperLU.spec @@ -4,7 +4,7 @@ Name: SuperLU Version: 5.2.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Subroutines to solve sparse linear systems License: BSD and GPLv2+ URL: https://portal.nersc.gov/project/sparse/superlu/ @@ -15,17 +15,21 @@ Patch1: %{genname}-removemc64.patch # Patch soname (5 -> 5.2) of shared library Patch2: %{name}-%{version}-set_soname.patch +%if 0%{?fedora} >= 33 +BuildRequires: pkgconfig(flexiblas) +%else %ifarch %{openblas_arches} BuildRequires: openblas-devel, openblas-srpm-macros %else BuildRequires: blas-devel %endif -BuildRequires: atlas-devel, gcc +BuildRequires: atlas-devel %if 0%{?epel} BuildRequires: epel-rpm-macros %endif +%endif BuildRequires: cmake3 -BuildRequires: gcc-gfortran +BuildRequires: gcc, gcc-gfortran BuildRequires: csh %description @@ -64,12 +68,14 @@ sed -i.bak '/NOOPTS/d' make.inc.in sed -e 's|-O0|-O2|g' -i SRC/CMakeLists.txt %build -mkdir -p build; pushd build - # Do not use bundled CBLAS code -%cmake3 -Denable_blaslib:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=Release .. -%make_build -popd +%cmake3 -B build \ + -Denable_blaslib:BOOL=OFF \ +%if 0%{?fedora} >= 33 + -DBLAS_LIBRARIES=-lflexiblas \ +%endif + -DCMAKE_BUILD_TYPE:STRING=Release +%make_build -C build # Compile Fortran example interface to use the C routines in SuperLU make -C FORTRAN @@ -113,6 +119,9 @@ popd %doc DOC %changelog +* Sat Jul 25 2020 Iñaki Úcar - 5.2.1-12 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Tue Jul 21 2020 Merlin Mathesius - 5.2.1-11 - Minor conditional fix for ELN - Stick to cmake in-source building