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=b799dad8149b....
Change:
-%ifnarch %{power64}
Thanks.
Full change:
============
commit b799dad8149ba30869f260ad3797ac8ce50488a3
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Mon Jul 22 21:01:25 2019 +0200
Update to 5.2.1
diff --git a/.gitignore b/.gitignore
index 1331f72..8b8b8db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/MUMPS_5.0.2.tar.gz
/MUMPS_5.1.1.tar.gz
/MUMPS_5.1.2.tar.gz
+/MUMPS_5.2.1.tar.gz
diff --git a/MUMPS-shared.patch b/MUMPS-shared.patch
index 4c99604..84ae36f 100644
--- a/MUMPS-shared.patch
+++ b/MUMPS-shared.patch
@@ -16,8 +16,8 @@ Index: mumps/src/Makefile
+ $(libdir)/lib$(ARITH)mumps$(PLAT).so
OBJS_COMMON_MOD = \
- lr_common.o \
-@@ -167,14 +169,23 @@
+ ana_omp_m.o\
+@@ -177,14 +179,24 @@
$(ARITH)tools.o\
$(ARITH)type3_root.o
@@ -42,10 +42,11 @@ Index: mumps/src/Makefile
+ ln -fs lib$(ARITH)mumps$(PLAT)-$(SONAME_VERSION).so $@
+
+
++
# Dependencies between modules:
- $(ARITH)mumps_load.o: $(ARITH)mumps_comm_buffer.o \
- $(ARITH)mumps_struc_def.o \
-@@ -290,13 +301,13 @@
+ # i) arithmetic-dependent modules:
+ $(ARITH)ana_aux.o: $(ARITH)mumps_struc_def.o \
+@@ -382,13 +394,13 @@
.SUFFIXES: .c .F .o
.F.o:
@@ -60,5 +61,5 @@ Index: mumps/src/Makefile
- $(IORDERINGSC) $(ORDERINGSC) -I../include -c mumps_c.c $(OUTC)$@
+ $(IORDERINGSC) $(ORDERINGSC) -I../include -fPIC -c mumps_c.c $(OUTC)$@
-
clean:
+ $(RM) *.o *.mod
diff --git a/MUMPS.spec b/MUMPS.spec
index 39e641c..00dacd2 100644
--- a/MUMPS.spec
+++ b/MUMPS.spec
@@ -1,14 +1,12 @@
-%if 0%{?rhel} < 7
-%{!?__global_ldflags: %global __global_ldflags -Wl,-z,relro}
-%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 5.1.2
+%global soname_version 5.2
+
+%undefine _ld_as_needed
%ifarch %{openblas_arches}
%global with_openmp 1
@@ -16,20 +14,7 @@
%global with_openmp 0
%endif
-%if 0%{?rhel} || 0%{?rhel} < 7
-%ifarch %{power64}
-%global with_mpicheck 0
-%global with_mpich 0
-%endif
-%endif
-%if 0%{?rhel} || 0%{?rhel} < 7
-%ifnarch %{power64}
-%global with_mpicheck 1
-%global with_mpich 1
-%global with_openmpi 1
-%endif
-%endif
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel} || 0%{?rhel} >= 7
%global with_mpicheck 1
%global with_mpich 1
%global with_openmpi 1
@@ -38,17 +23,9 @@
%global with_mpich 1
%global with_openmpi 1
-# Disable tests with OpenMPI-4
-# Caught signal 11 (Segmentation fault: address not mapped to object at address
0x7f1f0ad30948)
-%if 0%{?fedora}
-%global with_mpicheck 0
-%else
-%global with_mpicheck 1
-%endif
-
Name: MUMPS
-Version: 5.1.2
-Release: 10%{?dist}
+Version: 5.2.1
+Release: 1%{?dist}
Summary: A MUltifrontal Massively Parallel sparse direct Solver
License: CeCILL-C
URL:
http://mumps.enseeiht.fr/
@@ -115,7 +92,6 @@ BuildArch: noarch
This package contains common documentation files for MUMPS.
########################################################
-%if 0%{?fedora} || 0%{?rhel} >= 7
%if 0%{?with_openmp}
%package openmp
Summary: MUMPS libraries with OpenMP support
@@ -144,7 +120,6 @@ Requires: %{name}-openmp%{?_isa} = %{version}-%{release}
This package contains common illustrative
test programs about how MUMPS-openmp can be used.
%endif
-%endif
##########################################################
########################################################
@@ -237,9 +212,9 @@ test programs about how MUMPS-mpich can be used.
%prep
%setup -q -n %{name}_%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch0 -p1 -b .examples-mpilibs
+%patch1 -p1 -b .shared-pord
+%patch2 -p1 -b .shared
mv examples/README examples/README-examples
@@ -252,6 +227,9 @@ rm -f Makefile.inc
%{_openmpi_load}
cp -f %{SOURCE1} Makefile.inc
+# -DBLR_MT needs OpenMP
+sed -e 's| -DBLR_MT||g' -i Makefile.inc
+
%if 0%{?fedora}
%global mpif77_cflags %(env PKG_CONFIG_PATH=%{_libmpidir}/pkgconfig pkg-config --cflags
ompi-f77)
%global mpif77_libs %(env PKG_CONFIG_PATH=%{_libmpidir}/pkgconfig pkg-config --libs
ompi-f77)
@@ -268,15 +246,10 @@ cp -f %{SOURCE1} Makefile.inc
%endif
# 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|g' -i Makefile.inc
+sed -e 's|@@CFLAGS@@|%{optflags} -Dscotch -Dmetis -Dptscotch -DWITHOUT_PTHREAD
-I${MPI_FORTRAN_MOD_DIR}|g' -i Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags}|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|g' -i Makefile.inc
-%endif
%if 0%{?rhel} && 0%{?rhel} >= 7
sed -e 's|@@MPIFORTRANLIB@@|-L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir}
%{mpif77_libs}|g' -i Makefile.inc
%endif
@@ -298,7 +271,7 @@ LPORD=" -L$PWD/PORD/lib -lpord"
export MPIBLACSLIBS="-L$MPI_LIB -lmpiblacs"
export MPI_COMPILER_NAME=openmpi
export LD_LIBRARY_PATH="$MPI_LIB:%{_libdir}"
-export LDFLAGS="%{__global_ldflags} -Wl,-z,now"
+export LDFLAGS="%{__global_ldflags}"
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/lib
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/examples
@@ -326,7 +299,7 @@ make all \
LSCOTCH="$LSCOTCH" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now"
+ OPTL="%{__global_ldflags}"
%{_openmpi_unload}
cp -pr lib/* %{name}-%{version}-$MPI_COMPILER_NAME/lib
cp -pr examples/* %{name}-%{version}-$MPI_COMPILER_NAME/examples
@@ -341,8 +314,11 @@ make clean
%if 0%{?with_mpich}
rm -f Makefile.inc
cp -f %{SOURCE1} Makefile.inc
-%{_mpich_load}
+# -DBLR_MT needs OpenMP
+sed -e 's| -DBLR_MT||g' -i Makefile.inc
+
+%{_mpich_load}
%global mpif77_cflags %(env PKG_CONFIG_PATH=%{_libmpichdir}/pkgconfig pkg-config --cflags
mpich)
%global mpif77_libs %(env PKG_CONFIG_PATH=%{_libmpichdir}/pkgconfig pkg-config --libs
mpich)
%global mpifort_cflags %(env PKG_CONFIG_PATH=%{_libmpichdir}/pkgconfig pkg-config
--cflags mpich)
@@ -350,8 +326,8 @@ cp -f %{SOURCE1} Makefile.inc
%global mpich_libs %(env PKG_CONFIG_PATH=%{_libmpichdir}/pkgconfig pkg-config --libs
mpich)
# 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|g' -i Makefile.inc
+sed -e 's|@@CFLAGS@@|%{optflags} -Dscotch -Dmetis -Dptscotch -DWITHOUT_PTHREAD
-I${MPI_FORTRAN_MOD_DIR}|g' -i Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags}|g' -i Makefile.inc
sed -e 's|@@MPICLIB@@|-lmpich|g' -i Makefile.inc
sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs}|g' -i Makefile.inc
@@ -368,7 +344,7 @@ export LPORD=" -L$PWD/PORD/lib -lpord"
export MPIBLACSLIBS="-L$MPI_LIB -lmpiblacs"
export MPI_COMPILER_NAME=mpich
export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}
-export LDFLAGS="%{__global_ldflags} -Wl,-z,now"
+export LDFLAGS="%{__global_ldflags}"
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/lib
mkdir -p %{name}-%{version}-$MPI_COMPILER_NAME/examples
@@ -396,7 +372,7 @@ make all \
LSCOTCH="$LSCOTCH" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now"
+ OPTL="%{__global_ldflags}"
%{_mpich_unload}
cp -pr lib/* %{name}-%{version}-$MPI_COMPILER_NAME/lib
cp -pr examples/* %{name}-%{version}-$MPI_COMPILER_NAME/examples
@@ -413,9 +389,12 @@ patch -p0 < %{PATCH3}
rm -f Makefile.inc
cp -f %{SOURCE2} Makefile.inc
+# -DBLR_MT needs OpenMP
+sed -e 's| -DBLR_MT||g' -i 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|g' -i Makefile.inc
+sed -e 's|@@CFLAGS@@|%{optflags} -Dscotch -Dmetis -DWITHOUT_PTHREAD
-I%{_fmoddir}|g' -i Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags}|g' -i Makefile.inc
mkdir -p %{name}-%{version}/lib
mkdir -p %{name}-%{version}/examples
@@ -450,7 +429,7 @@ make all \
LSCOTCH=" -L%{_libdir} -lesmumps -lscotch -lscotcherr -lscotchmetis" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -Wl,-z,now"
+ OPTL="%{__global_ldflags}"
make -C examples
cp -pr lib/* %{name}-%{version}/lib
cp -pr examples/* %{name}-%{version}/examples
@@ -460,7 +439,6 @@ make clean
#######################################################
## Build OpenMP version
-%if 0%{?fedora} || 0%{?rhel} >= 7
%if 0%{?with_openmp}
patch -R -p0 < %{PATCH3}
@@ -476,8 +454,8 @@ rm -f Makefile.inc
cp -f %{SOURCE2} Makefile.inc
# Set build flags macro
-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
+sed -e 's|@@CFLAGS@@|%{optflags} -fopenmp -Dscotch -Dmetis -DWITHOUT_PTHREAD
-I%{_fmoddir}|g' -i Makefile.inc
+sed -e 's|@@-O@@|%{__global_ldflags} -fopenmp -lgomp -lrt|g' -i Makefile.inc
mkdir -p %{name}-%{version}-openmp/lib
mkdir -p %{name}-%{version}-openmp/examples
@@ -487,14 +465,14 @@ IPORD=" -I$PWD/PORD/include/"
LPORD=" -L$PWD/PORD/lib -lpordo"
%ifarch %{openblas_arches}
-export LIBBLAS="-L%{_libdir} -lopenblas"
+export LIBBLAS="-L%{_libdir} -lopenblaso"
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"
+export LDFLAGS="%{__global_ldflags} -fopenmp -lgomp -lrt"
make all \
SONAME_VERSION=%{soname_version} \
CC=gcc \
@@ -502,8 +480,8 @@ make all \
FL=gfortran \
MUMPS_LIBF77="${LIBBLAS}" \
LIBBLAS="${LIBBLAS}" \
- LIBOTHERS=" -lpthread" \
- LIBSEQ="-L../libseq -lmpiseq" \
+ LIBOTHERS=" " \
+ LIBSEQ="-L../libseq -lmpiseqo" \
INCSEQ="-I../libseq $INCBLAS" \
LMETISDIR=%{_libdir} \
LMETIS="-L%{_libdir} -lmetis" \
@@ -512,7 +490,7 @@ make all \
LSCOTCH=" -L%{_libdir} -lesmumps -lscotch -lscotcherr -lscotchmetis" \
IPORD="$IPORD" \
LPORD="$LPORD" \
- OPTL="%{__global_ldflags} -fopenmp -Wl,-z,now -lrt"
+ OPTL="%{__global_ldflags} -fopenmp -lrt"
make -C examples
cp -pr lib/* %{name}-%{version}-openmp/lib
cp -pr examples/* %{name}-%{version}-openmp/examples
@@ -520,7 +498,6 @@ rm -rf lib/*
cp -pr src/*.mod %{name}-%{version}-openmp/modules
make clean
%endif
-%endif
#######################################################
# Make sure documentation is using Unicode.
@@ -528,11 +505,9 @@ iconv -f iso8859-1 -t utf-8 README > README-t && mv
README-t README
%ldconfig_scriptlets
-%if 0%{?fedora} || 0%{?rhel} >= 7
%if 0%{?with_openmp}
%ldconfig_scriptlets openmp
%endif
-%endif
%check
# Running test programs
@@ -549,7 +524,6 @@ LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH \
./c_example
popd
-%if 0%{?fedora} || 0%{?rhel} >= 7
%if 0%{?with_openmp}
pushd %{name}-%{version}-openmp/examples
LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH \
@@ -564,15 +538,10 @@ LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH \
./c_example
popd
%endif
-%endif
%if 0%{?with_mpicheck}
%if 0%{?with_openmpi}
-%if 0%{?rhel} && 0%{?rhel} < 7
-module load %{_sysconfdir}/modulefiles/openmpi-%{_arch}
-%else
%{_openmpi_load}
-%endif
pushd %{name}-%{version}-openmpi/examples
export LD_LIBRARY_PATH=$PWD:../lib:$LD_LIBRARY_PATH
./ssimpletest < input_simpletest_real
@@ -583,11 +552,11 @@ mpirun -np 3 ./c_example
popd
%{_openmpi_unload}
%endif
-%endif
%if 0%{?with_mpich}
## Tests not perfomred due to 'gethostname' failure on koji
%endif
+%endif
%install
@@ -697,7 +666,6 @@ install -cpm 755 %{name}-%{version}/examples/README-*
$RPM_BUILD_ROOT%{_libexecd
install -cpm 644 %{name}-%{version}/modules/*
$RPM_BUILD_ROOT%{_fmoddir}/%{name}-%{version}/
############################################################
-%if 0%{?fedora} || 0%{?rhel} >= 7
%if 0%{?with_openmp}
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}-openmp/examples
mkdir -p $RPM_BUILD_ROOT%{_fmoddir}/%{name}-openmp-%{version}
@@ -728,7 +696,6 @@ install -cpm 755 %{name}-%{version}-openmp/examples/input_*
$RPM_BUILD_ROOT%{_li
install -cpm 755 %{name}-%{version}-openmp/examples/README-*
$RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{version}-openmp/examples
install -cpm 644 %{name}-%{version}-openmp/modules/*
$RPM_BUILD_ROOT%{_fmoddir}/%{name}-openmp-%{version}/
%endif
-%endif
##############################################################
install -cpm 644 include/*.h $RPM_BUILD_ROOT%{_includedir}/%{name}
@@ -792,7 +759,6 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
%{_libexecdir}/%{name}-%{version}/
#######################################################
-%if 0%{?fedora} || 0%{?rhel} >= 7
%if 0%{?with_openmp}
%files openmp
%{_libdir}/libmpiseqo-%{soname_version}.so
@@ -810,7 +776,6 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
%files openmp-examples
%{_libexecdir}/%{name}-%{version}-openmp/
%endif
-%endif
#######################################################
%files common
@@ -819,6 +784,9 @@ install -cpm 644 PORD/include/* $RPM_BUILD_ROOT%{_includedir}/%{name}
%license LICENSE
%changelog
+* Sat Jul 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 5.2.1-1
+- Update to 5.2.1
+
* Fri May 17 2019 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-10
- Require scalapack explicity (rhbz #1711291 #1711289)
- Disable tests with OpenMPI-4
diff --git a/sources b/sources
index 088b805..6c441c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (MUMPS_5.1.2.tar.gz) =
38a63b14a8df835be68b5fa310b39aa1815799220d56c176e4005797800959e9e08c9a6bf11d308ab82ea40b6f34d36072cebe7c1de39e0c314eb138b93f1b74
+SHA512 (MUMPS_5.2.1.tar.gz) =
3bd63aee5c41e834aac070e35d8524ff6bd60aa2fbfcf35e309e274a47c3361f4abf13572cda9a8fb24e75ac69d21b3769f78c1cbf35ef2725f3c5924db3410e