From 8525ebf92c80fb188483acda31e03802b3d799a2 Mon Sep 17 00:00:00 2001 From: Dave Love Date: Sep 18 2019 13:22:09 +0000 Subject: - Don't BR lapack with openblas --- diff --git a/scalapack-2.0.2-fedora-blas.patch b/scalapack-2.0.2-fedora-blas.patch index 3f4e2e5..f193fe2 100644 --- a/scalapack-2.0.2-fedora-blas.patch +++ b/scalapack-2.0.2-fedora-blas.patch @@ -5,7 +5,7 @@ diff -up scalapack-2.0.2/scalapack-2.0.2/Makefile.blas scalapack-2.0.2/scalapack ( cd EXAMPLE; $(MAKE) clean ) shared: scalapacklib -- ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; $(CC) -shared -o ../libscalapack.so.2.0.0 *.o *.oo -Wl,-soname=libscalapack.so.2 -lopenblas -llapack -L.. -lm -lgfortran ; cd .. ) +- ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; $(CC) -shared -o ../libscalapack.so.2.0.0 *.o *.oo -Wl,-soname=libscalapack.so.2 -lopenblas -L.. -lm -lgfortran ; cd .. ) + ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; $(CC) -shared -o ../libscalapack.so.2.0.0 *.o *.oo -Wl,-soname=libscalapack.so.2 -lblas -llapack -L.. -lm -lgfortran ; cd .. ) diff -up scalapack-2.0.2/scalapack-2.0.2/SLmake.inc.blas scalapack-2.0.2/scalapack-2.0.2/SLmake.inc --- scalapack-2.0.2/scalapack-2.0.2/SLmake.inc.blas 2016-11-29 11:41:10.475948495 +0100 diff --git a/scalapack-2.0.2-fedora.patch b/scalapack-2.0.2-fedora.patch index defb375..d781832 100644 --- a/scalapack-2.0.2-fedora.patch +++ b/scalapack-2.0.2-fedora.patch @@ -15,7 +15,7 @@ diff -up scalapack-2.0.2/scalapack-2.0.2/Makefile.fedora scalapack-2.0.2/scalapa ( cd EXAMPLE; $(MAKE) clean ) +shared: scalapacklib -+ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; $(CC) -shared -o ../libscalapack.so.2.0.0 *.o *.oo -Wl,-soname=libscalapack.so.2 -lopenblas -llapack -L.. -lm -lgfortran ; cd .. ) ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; $(CC) -shared -o ../libscalapack.so.2.0.0 *.o *.oo -Wl,-soname=libscalapack.so.2 -lopenblas -L.. -lm -lgfortran ; cd .. ) diff -up scalapack-2.0.2/scalapack-2.0.2/SLmake.inc.fedora scalapack-2.0.2/scalapack-2.0.2/SLmake.inc --- scalapack-2.0.2/scalapack-2.0.2/SLmake.inc.fedora 2014-02-12 11:19:04.618179216 -0500 +++ scalapack-2.0.2/scalapack-2.0.2/SLmake.inc 2014-02-12 11:19:00.675184482 -0500 diff --git a/scalapack.spec b/scalapack.spec index e7a57a4..958d895 100644 --- a/scalapack.spec +++ b/scalapack.spec @@ -33,15 +33,15 @@ Summary: A subset of LAPACK routines redesigned for heterogeneous computing Name: scalapack Version: 2.0.2 -Release: 30%{?dist} +Release: 31%{?dist} # This is freely distributable without any restrictions. License: Public Domain URL: http://www.netlib.org/scalapack/ Source0: http://www.netlib.org/scalapack/scalapack-%{version}.tgz -BuildRequires: lapack-devel %if %{with openblas} BuildRequires: openblas-devel %else +BuildRequires: lapack-devel BuildRequires: blas-devel %endif BuildRequires: gcc-gfortran, glibc-devel @@ -556,6 +556,9 @@ cp -f README ../ %endif %changelog +* Tue Sep 17 2019 Dave love - 2.0.2-31 +- Don't BR lapack with openblas + * Fri Jul 26 2019 Fedora Release Engineering - 2.0.2-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild