From 772f78a218798dc6c18524fd6e13118ab95c80a6 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Fri, 3 Sep 2021 00:08:33 +0200 Subject: [PATCH] drop support for building with other blas libs on F34+ --- arpack.spec | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/arpack.spec b/arpack.spec index a2f2438..4acbc79 100644 --- a/arpack.spec +++ b/arpack.spec @@ -1,19 +1,7 @@ %global build64 0 -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 7 -%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64} -%ifnarch %{openblas_arches} -# matches openblas ExclusiveArch -%bcond_without atlas -%else %if 0%{?__isa_bits} == 64 %global build64 1 %endif -%endif -%endif - -%if 0%{?fedora} >= 33 -%bcond_without flexiblas -%endif # We are linking FORTRAN symbols. Thus we cannot link --as-needed. %undefine _ld_as_needed @@ -31,15 +19,7 @@ Patch0: arpack-install-arpackicb_h.patch BuildRequires: gcc-c++ BuildRequires: gcc-gfortran -%if %{with flexiblas} BuildRequires: pkgconfig(flexiblas) -%else -%if %{with atlas} -BuildRequires: atlas-devel -%else -BuildRequires: openblas-devel -%endif -%endif BuildRequires: libtool >= 2.4.2 BuildRequires: make Provides: arpack-ng = %{version}-%{release} @@ -103,19 +83,7 @@ cp -pr src src64 %build -%if %{with flexiblas} %global blaslib -lflexiblas -%else -%if %{with atlas} -%if 0%{?fedora} || 0%{?rhel} >= 7 -%global blaslib -L%{_libdir}/atlas -ltatlas -%else -%global blaslib -L%{_libdir}/atlas -lf77blas -latlas -%endif -%else -%global blaslib -lopenblasp -%endif -%endif pushd src %configure --enable-shared --enable-static \ --with-blas="%{blaslib}" \ @@ -197,6 +165,7 @@ popd %changelog * Thu Sep 02 2021 Dominik Mierzejewski - 3.8.0-2 - ensure arpackicb.h is installed (#1990366) +- spec clean-up: drop support for building with other blas libs on F34+ * Wed Jun 02 2021 Dominik Mierzejewski - 3.8.0-1 - update to 3.8.0 (#1905263)