diff --git a/dolfin.spec b/dolfin.spec index 6a28bec..4fa45a7 100644 --- a/dolfin.spec +++ b/dolfin.spec @@ -2,7 +2,7 @@ Name: dolfin Version: 2019.1.0.post0 %global fenics_version 2019.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: FEniCS computational backend and problem solving environment License: LGPLv3+ @@ -11,6 +11,12 @@ Source0: https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-%{v Source1: https://bitbucket.org/fenics-project/dolfin/downloads/dolfin-%{version}.tar.gz.asc Source2: 3083BE4C722232E28AD0828CBED06106DD22BAB3.gpg +%if 0%{?fedora} >= 33 +%global blaslib flexiblas +%else +%global blaslib openblas +%endif + BuildRequires: gcc-c++ BuildRequires: gnupg2 BuildRequires: cmake @@ -20,8 +26,7 @@ BuildRequires: petsc-devel BuildRequires: sundials-devel BuildRequires: scotch-devel # ptscotch-mpich-devel? -BuildRequires: blas-devel -# openblas-devel? +BuildRequires: %{blaslib}-devel BuildRequires: hdf5-devel # hdf5-mpich-devel? BuildRequires: zlib-devel @@ -94,7 +99,9 @@ sed -r -i 's|boost/detail/endian.hpp|boost/endian/arithmetic.hpp|' \ %build # %%_mpich_load mkdir -p build && cd build -CFLAGS=-Wno-unused-variable %cmake .. -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=off +CFLAGS=-Wno-unused-variable %cmake .. \ + -DBLAS_LIBRARIES=-l%{blaslib} \ + -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=off %make_build # "temporary install" so the python build can find the stuff it needs @@ -157,6 +164,9 @@ ctest -V %{?_smp_mflags} %{python3_sitearch}/fenics_dolfin-%{fenics_version}*-py%{python3_version}.egg-info/ %changelog +* Thu Aug 27 2020 Iñaki Úcar - 2019.1.0.post0-10 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Tue Aug 04 2020 Gwyn Ciesla - 2019.1.0.post0-9 - Fix FTBFS.