diff --git a/getdp.spec b/getdp.spec index a13d3f2..53f8ed9 100644 --- a/getdp.spec +++ b/getdp.spec @@ -1,6 +1,12 @@ +%if 0%{?fedora} >= 33 +%global blaslib flexiblas +%else +%global blaslib openblas +%endif + Name: getdp Version: 3.3.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: General Environment for the Treatment of Discrete Problems License: GPLv2+ @@ -12,7 +18,7 @@ BuildRequires: gcc-c++ gcc-gfortran BuildRequires: arpack-devel BuildRequires: gmsh-devel BuildRequires: gsl-devel -BuildRequires: lapack-devel blas-devel openblas-devel +BuildRequires: %{blaslib}-devel BuildRequires: python3-devel BuildRequires: petsc-devel BuildRequires: SuperLU-devel @@ -49,9 +55,12 @@ find contrib/ -mindepth 1 -maxdepth 1 -type d -not \( -name pewe \) -prune -exec # fix lib -> lib64 for petsc detection sed -i 's|${ENV_PETSC_ARCH}/lib|${ENV_PETSC_ARCH}/%_lib|g' CMakeLists.txt +# set blas in bundled lib +sed -i 's|-llapack -lblas|-l%{blaslib}|' contrib/pewe/fortran/Makefile %build %cmake \ + -DBLAS_LAPACK_LIBRARIES="-l%{blaslib}" \ -DENABLE_MULTIHARMONIC=ON \ -DENABLE_NX=OFF \ -DENABLE_OPENMP=ON \ @@ -93,6 +102,9 @@ rm -rf %{buildroot}%{_datadir}/doc/%{name} %{_libdir}/libgetdp.so %changelog +* Fri Aug 14 2020 Iñaki Úcar - 3.3.0-6 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Mon Jul 27 2020 Fedora Release Engineering - 3.3.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild