The package rpms/MUMPS.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/MUMPS.git/commit/?id=c6f2a6f9d0a4....
Change:
+%ifarch %{openblas_arches}
Thanks.
Full change:
============
commit c6f2a6f9d0a44cbbdcec111a3717611cc7d60935
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sun Oct 29 12:30:39 2017 +0100
Update to 5.1.2
diff --git a/.gitignore b/.gitignore
index fe64264..1331f72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/MUMPS_5.0.1.tar.gz
/MUMPS_5.0.2.tar.gz
/MUMPS_5.1.1.tar.gz
+/MUMPS_5.1.2.tar.gz
diff --git a/MUMPS-Makefile.par.inc b/MUMPS-Makefile.par.inc
index 6216f14..b7aafc2 100644
--- a/MUMPS-Makefile.par.inc
+++ b/MUMPS-Makefile.par.inc
@@ -85,13 +85,13 @@ LIBPAR = $(SCALAP) $(MPIFLIB)
INCSEQ = -I$(topdir)/libseq
LIBSEQ = -L$(topdir)/libseq -lmpiseq$(PLAT)
#LIBBLAS = -L/usr/lib/xmm/ -lf77blas -latlas
-LIBBLAS = -lblas
+#LIBBLAS = -lblas
LIBOTHERS = -lpthread
#Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
CDEFS = -DAdd_
#Begin Optimized options
-OPTF = @@CFLAGS@@ -Dintel_
+OPTF = @@CFLAGS@@ -Dintel_ -DBLR_MT -Wno-unused-dummy-argument
-Wno-maybe-uninitialized
OPTL = @@-O@@
OPTC = @@CFLAGS@@
#End Optimized options
diff --git a/MUMPS-Makefile.seq.inc b/MUMPS-Makefile.seq.inc
index 3b62a07..76d2b3d 100644
--- a/MUMPS-Makefile.seq.inc
+++ b/MUMPS-Makefile.seq.inc
@@ -75,14 +75,14 @@ RANLIB = echo
INCSEQ = -I$(topdir)/libseq
LIBSEQ = -L$(topdir)/libseq -lmpiseq
#LIBBLAS = -L/usr/lib/xmm/ -lf77blas -latlas
-LIBBLAS = -lblas -llapack
+#LIBBLAS = -lblas -llapack
LIBOTHERS = -lpthread
METISLIB = -lmetis
#Preprocessor defs for calling Fortran from C (-DAdd_ or -DAdd__ or -DUPPER)
CDEFS = -DAdd_
#Begin Optimized options
-OPTF = @@CFLAGS@@ -Dintel_
+OPTF = @@CFLAGS@@ -Dintel_ -DBLR_MT -Wno-unused-dummy-argument
-Wno-maybe-uninitialized
OPTL = @@-O@@
OPTC = @@CFLAGS@@
#End Optimized options
diff --git a/MUMPS-shared-openmp.patch b/MUMPS-shared-openmp.patch
index 372f6b7..a62aa96 100644
--- a/MUMPS-shared-openmp.patch
+++ b/MUMPS-shared-openmp.patch
@@ -30,16 +30,16 @@ Index: mumps/src/Makefile
-$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER)
- $(AR)$@ $?
+$(libdir)/libmumpso_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-+ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ ln -s libmumpso_common$(PLAT)-5.1.1.so $@
++ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumpso_common$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ ln -fs libmumpso_common$(PLAT)-$(SONAME_VERSION).so $@
+
+$(libdir)/lib$(ARITH)mumpso$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER)
+ $(AR) $@ $?
$(RANLIB) $@
+$(libdir)/lib$(ARITH)mumpso$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER)
-+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
-lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ ln -s lib$(ARITH)mumpso$(PLAT)-5.1.1.so $@
++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) -lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB)
$(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ ln -fs lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $@
+
# Dependencies between modules:
$(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \
diff --git a/MUMPS-shared-pord-openmp.patch b/MUMPS-shared-pord-openmp.patch
index d158fd0..47200db 100644
--- a/MUMPS-shared-pord-openmp.patch
+++ b/MUMPS-shared-pord-openmp.patch
@@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile
$(RANLIB) $@
+libpordo$(PLAT).so: $(OBJS)
-+ $(CC) -shared $(OBJS) -Wl,-soname,libpordo$(PLAT)-5.1.1.so -o libpordo$(PLAT)-5.1.1.so
$(OPTL) -Wl,-z,defs
-+ ln -s libpordo$(PLAT)-5.1.1.so $@
++ $(CC) -shared $(OBJS) -Wl,-soname,libpordo$(PLAT)-$(SONAME_VERSION).so -o
libpordo$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ ln -fs libpordo$(PLAT)-$(SONAME_VERSION).so $@
+
clean:
rm -f *.o
diff --git a/MUMPS-shared-pord.patch b/MUMPS-shared-pord.patch
index df27715..25c1a2a 100644
--- a/MUMPS-shared-pord.patch
+++ b/MUMPS-shared-pord.patch
@@ -24,8 +24,8 @@ Index: mumps/PORD/lib/Makefile
$(RANLIB) $@
+libpord$(PLAT).so: $(OBJS)
-+ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-5.1.1.so -o libpord$(PLAT)-5.1.1.so
$(OPTL) -Wl,-z,defs
-+ ln -s libpord$(PLAT)-5.1.1.so $@
++ $(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-$(SONAME_VERSION).so -o
libpord$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ ln -fs libpord$(PLAT)-$(SONAME_VERSION).so $@
+
clean:
rm -f *.o
diff --git a/MUMPS-shared-seq-openmp.patch b/MUMPS-shared-seq-openmp.patch
index 20d2831..fbe3956 100644
--- a/MUMPS-shared-seq-openmp.patch
+++ b/MUMPS-shared-seq-openmp.patch
@@ -19,8 +19,8 @@ Create a shared version of the sequential library, MUST BE LAST IN
SERIES
$(AR)$@ mpi.o mpic.o elapse.o
$(RANLIB) $@
+libmpiseqo$(PLAT).so: mpi.o mpic.o elapse.o
-+ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseqo$(PLAT)-5.1.1.so -o
libmpiseqo$(PLAT)-5.1.1.so
-+ ln -s libmpiseqo$(PLAT)-5.1.1.so $@
++ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseqo$(PLAT)-$(SONAME_VERSION).so -o
libmpiseqo$(PLAT)-$(SONAME_VERSION).so
++ ln -fs libmpiseqo$(PLAT)-$(SONAME_VERSION).so $@
.f.o:
- $(FC) $(OPTF) -c $*.f $(OUTF)$*.o
+ $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o
@@ -48,18 +48,18 @@ Create a shared version of the sequential library, MUST BE LAST IN
SERIES
$(RANLIB) $@
$(libdir)/libmumpso_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-- $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o
$(libdir)/libmumpso_common$(PLAT)-5.1.1.so -Wl,-z,defs
- ln -s libmumpso_common$(PLAT)-5.1.1.so $@
+- $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumpso_common$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,libmumpso_common$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o
$(libdir)/libmumpso_common$(PLAT)-$(SONAME_VERSION).so -Wl,-z,defs
+ ln -fs libmumpso_common$(PLAT)-$(SONAME_VERSION).so $@
$(libdir)/lib$(ARITH)mumpso$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER)
@@ -168,7 +168,7 @@
$(RANLIB) $@
$(libdir)/lib$(ARITH)mumpso$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER)
-- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
-lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
-lmumpso_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumpso$(PLAT)-5.1.1.so -Wl,-z,defs
- ln -s lib$(ARITH)mumpso$(PLAT)-5.1.1.so $@
+- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) -lmumpso_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB)
$(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) -lmumpso_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB)
$(SCALAP) -o $(libdir)/lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so -Wl,-z,defs
+ ln -fs lib$(ARITH)mumpso$(PLAT)-$(SONAME_VERSION).so $@
diff --git a/MUMPS-shared-seq.patch b/MUMPS-shared-seq.patch
index 6c05248..5f8400a 100644
--- a/MUMPS-shared-seq.patch
+++ b/MUMPS-shared-seq.patch
@@ -18,8 +18,8 @@ Create a shared version of the sequential library, MUST BE LAST IN
SERIES
$(AR)$@ mpi.o mpic.o elapse.o
$(RANLIB) $@
+libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o
-+ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseq$(PLAT)-5.1.1.so -o
libmpiseq$(PLAT)-5.1.1.so
-+ ln -s libmpiseq$(PLAT)-5.1.1.so $@
++ $(FC) -shared $^ -Wl,--as-needed -Wl,-soname,libmpiseq$(PLAT)-$(SONAME_VERSION).so -o
libmpiseq$(PLAT)-$(SONAME_VERSION).so
++ ln -fs libmpiseq$(PLAT)-$(SONAME_VERSION).so $@
.f.o:
- $(FC) $(OPTF) -c $*.f $(OUTF)$*.o
+ $(FC) $(OPTF) -fPIC -c $*.f $(OUTF)$*.o
@@ -47,18 +47,18 @@ Create a shared version of the sequential library, MUST BE LAST IN
SERIES
$(RANLIB) $@
$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-- $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-5.1.1.so -Wl,-z,defs
- ln -s libmumps_common$(PLAT)-5.1.1.so $@
+- $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-$(SONAME_VERSION).so -Wl,-z,defs
+ ln -fs libmumps_common$(PLAT)-$(SONAME_VERSION).so $@
$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER)
@@ -168,7 +168,7 @@
$(RANLIB) $@
$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER)
-- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.1.so -Wl,-z,defs
- ln -s lib$(ARITH)mumps$(PLAT)-5.1.1.so $@
+- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) -lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB)
$(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB)
$(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so -Wl,-z,defs
+ ln -fs lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $@
diff --git a/MUMPS-shared.patch b/MUMPS-shared.patch
index 6a55dd4..4c99604 100644
--- a/MUMPS-shared.patch
+++ b/MUMPS-shared.patch
@@ -30,16 +30,16 @@ Index: mumps/src/Makefile
-$(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT): $(OBJS_MOD) $(OBJS_OTHER)
- $(AR)$@ $?
+$(libdir)/libmumps_common$(PLAT).so: $(OBJS_COMMON_MOD) $(OBJS_COMMON_OTHER)
-+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ ln -s libmumps_common$(PLAT)-5.1.1.so $@
++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) $(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ ln -fs libmumps_common$(PLAT)-$(SONAME_VERSION).so $@
+
+$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER)
+ $(AR) $@ $?
$(RANLIB) $@
+$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER)
-+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumps$(PLAT)-5.1.1.so $(OPTL) -Wl,-z,defs
-+ ln -s lib$(ARITH)mumps$(PLAT)-5.1.1.so $@
++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL)
-L$(libdir) -lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB)
$(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $(OPTL) -Wl,-z,defs
++ ln -fs lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $@
+
+
# Dependencies between modules:
diff --git a/MUMPS.spec b/MUMPS.spec
index d74a20b..c9ef937 100644
--- a/MUMPS.spec
+++ b/MUMPS.spec
@@ -2,23 +2,29 @@
%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
%endif
+# openblas available on these architectures.
+%if 0%{?fedora} && 0%{?fedora} > 26
+%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64
s390x}
+%else
+%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
+%endif
+%if 0%{?rhel}
+%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
+%endif
+
## Define libraries' destination
%global _incmpidir %{_includedir}/openmpi-%{_arch}
%global _libmpidir %{_libdir}/openmpi/lib
%global _incmpichdir %{_includedir}/mpich-%{_arch}
%global _libmpichdir %{_libdir}/mpich/lib
-%global soname_version %{version}
+%global soname_version 5.1.2
-# openblas Upstream supports the package only on these architectures.
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%{!?openblas_arches:%global openblas_arches x86_64 %{ix86} armv7hl %{power64} aarch64}
%ifarch %{openblas_arches}
%global with_openmp 1
%else
%global with_openmp 0
%endif
-%endif
%if 0%{?rhel} || 0%{?rhel} < 7
%ifarch %{power64}
@@ -58,8 +64,8 @@
%endif
Name: MUMPS
-Version: 5.1.1
-Release: 4%{?dist}
+Version: 5.1.2
+Release: 2%{?dist}
Summary: A MUltifrontal Massively Parallel sparse direct Solver
License: CeCILL-C
Group: Development/Libraries
@@ -86,8 +92,12 @@ Patch6: %{name}-shared-seq-openmp.patch
Patch7: %{name}-examples-openmp.patch
BuildRequires: gcc-gfortran
+%ifarch %{openblas_arches}
+BuildRequires: openblas-devel, openblas-srpm-macros
+%else
BuildRequires: blas-devel
BuildRequires: lapack-devel
+%endif
BuildRequires: metis-devel
BuildRequires: scotch-devel
@@ -132,7 +142,12 @@ This package contains common documentation files for MUMPS.
Summary: MUMPS libraries with OpenMP support
Group: Development/Libraries
-BuildRequires: openblas-devel
+%ifarch %{openblas_arches}
+BuildRequires: openblas-devel, openblas-srpm-macros
+%else
+BuildRequires: blas-devel
+BuildRequires: lapack-devel
+%endif
Requires: %{name}-common = %{version}-%{release}
%description openmp
MUMPS libraries with OpenMP support.
@@ -281,54 +296,64 @@ cp -f %{SOURCE1} Makefile.inc
# Set build flags macro
sed -e 's|@@CFLAGS@@|%{optflags} -Wl,-z,now -Dscotch -Dmetis -Dptscotch -pthread
-I%{_fmoddir}|g' -i Makefile.inc
-sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now -Wl,--as-needed|g' -i
Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now|g' -i Makefile.inc
sed -e 's|@@MPICLIB@@|-lmpi|g' -i Makefile.inc
## EPEL6 provides OpenMPI 1.8.1
## EPEL7 provides OpenMPI 1.10.0
%if 0%{?rhel} && 0%{?rhel} < 7
-sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir}
%{mpif77_libs} -lopen-rte -lopen-pal -L%{_libdir} -llapack -lblas|g' -i Makefile.inc
+sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir}
%{mpif77_libs} -lopen-rte -lopen-pal|g' -i Makefile.inc
%endif
%if 0%{?rhel} && 0%{?rhel} >= 7
-sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir}
%{mpif77_libs} -L%{_libdir} -llapack -lblas|g' -i Makefile.inc
+sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir}
%{mpif77_libs}|g' -i Makefile.inc
%endif
%if 0%{?fedora}
-sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -L%{_libdir} -llapack -lblas|g' -i
Makefile.inc
+sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs}|g' -i Makefile.inc
%endif
MUMPS_MPI=openmpi
-MUMPS_INCDIR=-I%{_incmpidir}
+MUMPS_INCDIR=-I$MPI_INCLUDE
LMETISDIR=%{_libdir}
LMETIS="-L%{_libdir} -lmetis"
-SCOTCHDIR=%{_libmpidir}
-ISCOTCH=-I%{_incmpidir}
-LSCOTCH=" -Wl,--as-needed -L%{_libmpidir} -lesmumps -lscotch -lscotcherr -lptesmumps
-lptscotch -lptscotcherr"
+SCOTCHDIR=$MPI_LIB
+ISCOTCH=-I$MPI_INCLUDE
+LSCOTCH=" -L$MPI_LIB -lesmumps -lscotch -lscotcherr -lptesmumps -lptscotch
-lptscotcherr"
IPORD=" -I$PWD/PORD/include/"
LPORD=" -L$PWD/PORD/lib -lpord"
-export MPIBLACSLIBS="-L%{_libmpidir} -lmpiblacs"
+export MPIBLACSLIBS="-L$MPI_LIB -lmpiblacs"
export MPI_COMPILER_NAME=openmpi
-export LD_LIBRARY_PATH="%{_libmpidir}:%{_libdir}"
-export LDFLAGS="%{__global_ldflags} -Wl,-z,now -Wl,--as-needed"
+export LD_LIBRARY_PATH="$MPI_LIB:%{_libdir}"
+export LDFLAGS="%{__global_ldflags} -Wl,-z,now"
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/lib
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/examples
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/modules
-make \
- CC=%{_libdir}/openmpi/bin/mpicc \
- FC=%{_libdir}/openmpi/bin/mpif77 \
- FL=%{_libdir}/openmpi/bin/mpif77 \
+
+%ifarch %{openblas_arches}
+export LIBBLAS="-L%{_libdir} -lopenblas"
+export INCBLAS=-I%{_includedir}/openblas
+%else
+export LIBBLAS="-L%{_libdir} -lblas -llapack"
+export INCBLAS=-I%{_includedir}
+%endif
+
+make -j1 \
+ SONAME_VERSION=%{soname_version} \
+ CC=$MPI_BIN/mpicc \
+ FC=$MPI_BIN/mpif77 \
+ FL=$MPI_BIN/mpif77 \
MUMPS_MPI="$MUMPS_MPI" \
- MUMPS_INCDIR="$MUMPS_INCDIR" \
- MUMPS_LIBF77="-L%{_libdir} -lblas -L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir}
%{mpic_libs} $MPIFORTRANSLIB $MPIBLACSLIBS -lscalapack" \
+ MUMPS_INCDIR="$MUMPS_INCDIR $INCBLAS" \
+ MUMPS_LIBF77="${LIBBLAS} -L$MPI_LIB -Wl,-rpath -Wl,$MPI_LIB %{mpic_libs}
$MPIFORTRANSLIB $MPIBLACSLIBS -lscalapack" \
LMETISDIR="$LMETISDIR" LMETIS="$LMETIS" \
SCOTCHDIR=$SCOTCHDIR \
ISCOTCH=$ISCOTCH \
LSCOTCH="$LSCOTCH" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now -Wl,--as-needed" all
+ OPTL="%{__global_ldflags} -Wl,-z,now" all
%{_openmpi_unload}
cp -pr lib/* %{name}-%{version}-$MPI_COMPILER_NAME/lib
cp -pr examples/* %{name}-%{version}-$MPI_COMPILER_NAME/examples
@@ -353,42 +378,52 @@ cp -f %{SOURCE1} Makefile.inc
# Set build flags macro
sed -e 's|@@CFLAGS@@|%{optflags} -Wl,-z,now -Dscotch -Dmetis -Dptscotch
-I%{_fmoddir}|g' -i Makefile.inc
-sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now -Wl,--as-needed|g' -i
Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now|g' -i Makefile.inc
sed -e 's|@@MPICLIB@@|-lmpich|g' -i Makefile.inc
-sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -L%{_libdir} -llapack -lblas|g' -i
Makefile.inc
+sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs}|g' -i Makefile.inc
MUMPS_MPI=mpich
-MUMPS_INCDIR=-I%{_incmpichdir}
+MUMPS_INCDIR=-I$MPI_INCLUDE
LMETISDIR=%{_libdir}
LMETIS="-L%{_libdir} -lmetis"
-SCOTCHDIR=%{_libmpichdir}
-ISCOTCH=-I%{_incmpichdir}
-LSCOTCH=" -Wl,--as-needed -L%{_libmpichdir} -lesmumps -lscotch -lscotcherr
-lptesmumps -lptscotch -lptscotcherr"
-IPORD=" -I$PWD/PORD/include/"
-LPORD=" -L$PWD/PORD/lib -lpord"
+SCOTCHDIR=$MPI_LIB
+ISCOTCH=-I$MPI_INCLUDE
+LSCOTCH=" -L$MPI_LIB -lesmumps -lscotch -lscotcherr -lptesmumps -lptscotch
-lptscotcherr"
+export IPORD=" -I$PWD/PORD/include/"
+export LPORD=" -L$PWD/PORD/lib -lpord"
-export MPIBLACSLIBS="-L%{_libmpichdir} -lmpiblacs"
+export MPIBLACSLIBS="-L$MPI_LIB -lmpiblacs"
export MPI_COMPILER_NAME=mpich
-export LD_LIBRARY_PATH=%{_libmpichdir}:%{_libdir}
-export LDFLAGS="%{__global_ldflags} -Wl,-z,now -Wl,--as-needed"
+export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}
+export LDFLAGS="%{__global_ldflags} -Wl,-z,now"
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/lib
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/examples
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/modules
-make \
- CC=%{_libdir}/mpich/bin/mpicc \
- FC=%{_libdir}/mpich/bin/mpif77 \
- FL=%{_libdir}/mpich/bin/mpif77 \
+
+%ifarch %{openblas_arches}
+export LIBBLAS="-L%{_libdir} -lopenblas"
+export INCBLAS=-I%{_includedir}/openblas
+%else
+export LIBBLAS="-L%{_libdir} -lblas -llapack"
+export INCBLAS=-I%{_includedir}
+%endif
+
+make -j1 \
+ SONAME_VERSION=%{soname_version} \
+ CC=$MPI_BIN/mpicc \
+ FC=$MPI_BIN/mpif77 \
+ FL=$MPI_BIN/mpif77 \
MUMPS_MPI="$MUMPS_MPI" \
- MUMPS_INCDIR="$MUMPS_INCDIR" \
- MUMPS_LIBF77="-L%{_libdir} -lblas -L%{_libmpichdir} %{mpich_libs} $MPIFORTRANSLIB
$MPIBLACSLIBS -lscalapack" \
+ MUMPS_INCDIR="$MUMPS_INCDIR $INCBLAS" \
+ MUMPS_LIBF77="${LIBBLAS} -L$MPI_LIB %{mpich_libs} $MPIFORTRANSLIB $MPIBLACSLIBS
-lscalapack" \
LMETISDIR="$LMETISDIR" LMETIS="$LMETIS" \
SCOTCHDIR=$SCOTCHDIR \
ISCOTCH=$ISCOTCH \
LSCOTCH="$LSCOTCH" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now -Wl,--as-needed" all
+ OPTL="%{__global_ldflags} -Wl,-z,now" all
%{_mpich_unload}
cp -pr lib/* %{name}-%{version}-$MPI_COMPILER_NAME/lib
cp -pr examples/* %{name}-%{version}-$MPI_COMPILER_NAME/examples
@@ -407,7 +442,7 @@ cp -f %{SOURCE2} Makefile.inc
# Set build flags macro
sed -e 's|@@CFLAGS@@|%{optflags} -Wl,-z,now -Dscotch -Dmetis -pthread
-I%{_fmoddir}|g' -i Makefile.inc
-sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now -Wl,--as-needed|g' -i
Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now|g' -i Makefile.inc
mkdir -p %{name}-%{version}/lib
mkdir -p %{name}-%{version}/examples
@@ -416,23 +451,33 @@ mkdir -p %{name}-%{version}/modules
IPORD=" -I$PWD/PORD/include/"
LPORD=" -L$PWD/PORD/lib -lpord"
-export LDFLAGS="%{__global_ldflags} -Wl,-z,now -Wl,--as-needed"
-make \
+%ifarch %{openblas_arches}
+export LIBBLAS="-L%{_libdir} -lopenblas"
+export INCBLAS=-I%{_includedir}/openblas
+%else
+export LIBBLAS="-L%{_libdir} -lblas -llapack"
+export INCBLAS=-I%{_includedir}
+%endif
+
+export LDFLAGS="%{__global_ldflags} -Wl,-z,now"
+make -j1 \
+ SONAME_VERSION=%{soname_version} \
CC=gcc \
FC=gfortran \
FL=gfortran \
- MUMPS_LIBF77="-L%{_libdir} -lblas -llapack" \
+ MUMPS_LIBF77="${LIBBLAS}" \
+ LIBBLAS="${LIBBLAS}" \
LIBOTHERS=" -lpthread" \
LIBSEQ="-L../libseq -lmpiseq" \
- INCSEQ="-I../libseq" \
+ INCSEQ="-I../libseq $INCBLAS" \
LMETISDIR=%{_libdir} \
LMETIS="-L%{_libdir} -lmetis" \
SCOTCHDIR=%{_prefix} \
ISCOTCH=-I%{_includedir} \
- LSCOTCH=" -Wl,--as-needed -L%{_libdir} -lesmumps -lscotch -lscotcherr
-lscotchmetis" \
+ LSCOTCH=" -L%{_libdir} -lesmumps -lscotch -lscotcherr -lscotchmetis" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now -Wl,--as-needed" all
+ OPTL="%{__global_ldflags} -Wl,-z,now" all
make -C examples
cp -pr lib/* %{name}-%{version}/lib
cp -pr examples/* %{name}-%{version}/examples
@@ -458,8 +503,8 @@ rm -f Makefile.inc
cp -f %{SOURCE2} Makefile.inc
# Set build flags macro
-sed -e 's|@@CFLAGS@@|%{optflags} -Wl,-z,now -Dscotch -Dmetis -fopenmp -pthread
-I%{_fmoddir}|g' -i Makefile.inc
-sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now -lgomp -lrt -Wl,--as-needed|g' -i
Makefile.inc
+sed -e 's|@@CFLAGS@@|%{optflags} -Wl,-z,now -fopenmp -Dscotch -Dmetis -pthread
-I%{_fmoddir}|g' -i Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags} -fopenmp -Wl,-z,now -lgomp -lrt|g' -i
Makefile.inc
mkdir -p %{name}-%{version}-openmp/lib
mkdir -p %{name}-%{version}-openmp/examples
@@ -468,24 +513,33 @@ mkdir -p %{name}-%{version}-openmp/modules
IPORD=" -I$PWD/PORD/include/"
LPORD=" -L$PWD/PORD/lib -lpordo"
-export LDFLAGS="%{__global_ldflags} -Wl,-z,now -lgomp -lrt -Wl,--as-needed"
-make \
+%ifarch %{openblas_arches}
+export LIBBLAS="-L%{_libdir} -lopenblas"
+export INCBLAS=-I%{_includedir}/openblas
+%else
+export LIBBLAS="-L%{_libdir} -lblas -llapack"
+export INCBLAS=-I%{_includedir}
+%endif
+
+export LDFLAGS="%{__global_ldflags} -fopenmp -Wl,-z,now -lgomp -lrt"
+make -j1 \
+ SONAME_VERSION=%{soname_version} \
CC=gcc \
FC=gfortran \
FL=gfortran \
- MUMPS_LIBF77="-L%{_libdir} -lopenblaso -llapack" \
- LIBBLAS="-L%{_libdir} -lopenblaso -llapack" \
+ MUMPS_LIBF77="${LIBBLAS}" \
+ LIBBLAS="${LIBBLAS}" \
LIBOTHERS=" -lpthread" \
LIBSEQ="-L../libseq -lmpiseq" \
- INCSEQ="-I../libseq -I%{_includedir}/openblas" \
+ INCSEQ="-I../libseq $INCBLAS" \
LMETISDIR=%{_libdir} \
LMETIS="-L%{_libdir} -lmetis" \
SCOTCHDIR=%{_prefix} \
ISCOTCH="-I%{_includedir}" \
- LSCOTCH=" -Wl,--as-needed -L%{_libdir} -lesmumps -lscotch -lscotcherr
-lscotchmetis" \
+ LSCOTCH=" -L%{_libdir} -lesmumps -lscotch -lscotcherr -lscotchmetis" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now -lgomp -lrt -Wl,--as-needed" all
+ OPTL="%{__global_ldflags} -fopenmp -Wl,-z,now -lrt" all
make -C examples
cp -pr lib/* %{name}-%{version}-openmp/lib
cp -pr examples/* %{name}-%{version}-openmp/examples
@@ -794,8 +848,14 @@ install -cpm 644 PORD/include/*
$RPM_BUILD_ROOT%{_includedir}/%{name}
%license LICENSE
%changelog
-* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.1-4
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+* Sat Oct 28 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-2
+- Set openblas arches
+
+* Sat Oct 28 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-1
+- Update to 5.1.2
+- Add -Wno-unused-dummy-argument -Wno-maybe-uninitialized options
+- Add new -DBLR_MT flag
+- Rebuild against openblas
* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.1-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
diff --git a/sources b/sources
index 0d18cc4..088b805 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (MUMPS_5.1.1.tar.gz) =
145dd61c9164bc50d07c2baf48345a2aca200332c4e359ea8b5b64fbb2027a6556f622a5620585b4852f785ba8e210267585c53634564f712828add2939901a9
+SHA512 (MUMPS_5.1.2.tar.gz) =
38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74