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=8e65dcc0be90....
Change:
+%ifarch ppc64le ppc64
Thanks.
Full change:
============
commit 07da307046ed3d30d5d433c18430ddc85d842660
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Jan 1 17:07:55 2020 +0100
Use libmpiblacs separately on EPEL 7+
diff --git a/MUMPS.spec b/MUMPS.spec
index 6d01a8c..6d34c90 100644
--- a/MUMPS.spec
+++ b/MUMPS.spec
@@ -25,7 +25,7 @@
Name: MUMPS
Version: 5.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: A MUltifrontal Massively Parallel sparse direct Solver
License: CeCILL-C
URL:
http://mumps.enseeiht.fr/
@@ -269,6 +269,9 @@ LSCOTCH=" -L$MPI_LIB -lesmumps -lscotch -lscotcherr -lptesmumps
-lptscotch -lpts
IPORD=" -I$PWD/PORD/include/"
LPORD=" -L$PWD/PORD/lib -lpord"
+%if 0%{?rhel} && 0%{?rhel} >= 7
+export MPIBLACSLIBS="-L$MPI_LIB -lmpiblacs"
+%endif
export MPI_COMPILER_NAME=openmpi
export LD_LIBRARY_PATH="$MPI_LIB:%{_libdir}"
export LDFLAGS="%{__global_ldflags}"
@@ -292,7 +295,7 @@ make all \
FL=$MPI_BIN/mpif77 \
MUMPS_MPI="$MUMPS_MPI" \
MUMPS_INCDIR="$MUMPS_INCDIR $INCBLAS" \
- MUMPS_LIBF77="${LIBBLAS} -L$MPI_LIB -Wl,-rpath -Wl,$MPI_LIB %{mpic_libs}
$MPIFORTRANSLIB -lscalapack" \
+ MUMPS_LIBF77="${LIBBLAS} -L$MPI_LIB -Wl,-rpath -Wl,$MPI_LIB %{mpic_libs}
$MPIFORTRANSLIB -lscalapack %{?rhel:$MPIBLACSLIBS}" \
LMETISDIR="$LMETISDIR" LMETIS="$LMETIS" \
SCOTCHDIR=$SCOTCHDIR \
ISCOTCH=$ISCOTCH \
@@ -341,6 +344,9 @@ LSCOTCH=" -L$MPI_LIB -lesmumps -lscotch -lscotcherr -lptesmumps
-lptscotch -lpts
export IPORD=" -I$PWD/PORD/include/"
export LPORD=" -L$PWD/PORD/lib -lpord"
+%if 0%{?rhel} && 0%{?rhel} >= 7
+export MPIBLACSLIBS="-L$MPI_LIB -lmpiblacs"
+%endif
export MPI_COMPILER_NAME=mpich
export LD_LIBRARY_PATH=$MPI_LIB:%{_libdir}
export LDFLAGS="%{__global_ldflags}"
@@ -364,7 +370,7 @@ make all \
FL=$MPI_BIN/mpif77 \
MUMPS_MPI="$MUMPS_MPI" \
MUMPS_INCDIR="$MUMPS_INCDIR $INCBLAS" \
- MUMPS_LIBF77="${LIBBLAS} -L$MPI_LIB %{mpich_libs} $MPIFORTRANSLIB -lscalapack"
\
+ MUMPS_LIBF77="${LIBBLAS} -L$MPI_LIB %{mpich_libs} $MPIFORTRANSLIB -lscalapack
%{?rhel:$MPIBLACSLIBS}" \
LMETISDIR="$LMETISDIR" LMETIS="$LMETIS" \
SCOTCHDIR=$SCOTCHDIR \
ISCOTCH=$ISCOTCH \
@@ -785,16 +791,19 @@ install -cpm 644 PORD/include/*
$RPM_BUILD_ROOT%{_includedir}/%{name}
%license LICENSE
%changelog
+* Wed Jan 01 2020 Antonio Trande <sagitter(a)fedoraproject.org> - 5.2.1-4
+- Use libmpiblacs separately on EPEL 7+
+
* Sun Nov 17 2019 Tom Callaway <spot(a)fedoraproject.org> - 5.2.1-3
- libmpiblacs is now inside of libscalapack
* Wed Jul 24 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.2.1-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-* Sat Jul 20 2019 Antonio Trande <sagitterATfedoraproject.org> - 5.2.1-1
+* Sat Jul 20 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 5.2.1-1
- Update to 5.2.1
-* Fri May 17 2019 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-10
+* Fri May 17 2019 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.2-10
- Require scalapack explicity (rhbz #1711291 #1711289)
- Disable tests with OpenMPI-4
@@ -810,19 +819,19 @@ install -cpm 644 PORD/include/*
$RPM_BUILD_ROOT%{_includedir}/%{name}
* Thu Jul 12 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.2-6
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-* Thu Feb 15 2018 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-5
+* Thu Feb 15 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.2-5
- Use %%ldconfig_scriptlets
* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.2-4
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-* Wed Jan 31 2018 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-3
+* Wed Jan 31 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.2-3
- Rebuild for GCC-8
-* Sat Oct 28 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-2
+* Sat Oct 28 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.2-2
- Set openblas arches
-* Sat Oct 28 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.2-1
+* Sat Oct 28 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.2-1
- Update to 5.1.2
- Add -Wno-unused-dummy-argument -Wno-maybe-uninitialized options
- Add new -DBLR_MT flag
@@ -831,97 +840,97 @@ install -cpm 644 PORD/include/*
$RPM_BUILD_ROOT%{_includedir}/%{name}
* 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
-* Mon Jun 19 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.1-2
+* Mon Jun 19 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.1-2
- Generate and install libmpiseq libraries (bug fix)
-* Tue Mar 21 2017 Antonio Trande <sagitterATfedoraproject.org> - 5.1.1-1
+* Tue Mar 21 2017 Antonio Trande <sagitter(a)fedoraproject.org> - 5.1.1-1
- Update to 5.1.1
- Build openmp version on Fedora and Rhel7 only
* Wed Mar 15 2017 Orion Poplawski <orion(a)cora.nwra.com> - 5.0.2-9
- Build with openblas on all available architectures
-* Tue Feb 14 2017 Antonio Trande <sagitterATfedoraproject.org> 5.0.2-8
+* Tue Feb 14 2017 Antonio Trande <sagitter(a)fedoraproject.org> 5.0.2-8
- Build OpenMPI version on Fedora26-s390
* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.2-7
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-* Tue Jan 31 2017 Antonio Trande <sagitterATfedoraproject.org> 5.0.2-6
+* Tue Jan 31 2017 Antonio Trande <sagitter(a)fedoraproject.org> 5.0.2-6
- Rebuild for gcc-gfortran
- Include Fortran modules
-* Fri Dec 02 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.2-5
+* Fri Dec 02 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-5
- Fix MPICH builds on s390
-* Tue Nov 01 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.2-4
+* Tue Nov 01 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-4
- Build on s390
- Rebuild on epel
-* Mon Oct 31 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.2-3
+* Mon Oct 31 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-3
- New architectures
* Fri Oct 21 2016 Orion Poplawski <orion(a)cora.nwra.com> - 5.0.2-2
- Rebuild for openmpi 2.0
-* Mon Jul 18 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.2-1
+* Mon Jul 18 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.2-1
- Update to 5.0.2
-* Fri Apr 29 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-20
+* Fri Apr 29 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-20
- Build MPICH libraries on PPC64* except EPEL6
* Mon Apr 04 2016 Peter Robinson <pbrobinson(a)fedoraproject.org> - 5.0.1-19
- aarch64/Power64 have mpich/openmpi now
-* Wed Mar 23 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-18
+* Wed Mar 23 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-18
- Examples directory moved under /usr/lib/openmpi(mpich)
-* Wed Mar 23 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-17
+* Wed Mar 23 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-17
- Added rpm-mpi-hooks as BR in examples sub-packages
- Added openmpi/mpich as Requires package
-* Wed Mar 23 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-16
+* Wed Mar 23 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-16
- Added rpm-mpi-hooks dependencies
-* Wed Mar 23 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-15
+* Wed Mar 23 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-15
- Fixed linker flags
-* Tue Mar 22 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-14
+* Tue Mar 22 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-14
- Fixed MPI paths
-* Sun Mar 20 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-13
+* Sun Mar 20 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-13
- Rebuild for Metis
- Compiled with OpenMP support (bz#1319477)
-* Fri Feb 12 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-12
+* Fri Feb 12 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-12
- Added linker flags to fix unused-direct-shlib-dependency
* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.0.1-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-* Fri Jan 08 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-10
+* Fri Jan 08 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-10
- Built MPICH libraries on EPEL (bz#1296387)
- Exclude OpenMPI on s390 arches
- Exclude MPICH on PPC arches
-* Thu Jan 07 2016 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-9
+* Thu Jan 07 2016 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-9
- Built MPICH libraries (bz#1296387)
- Removed useless Requires packages
-* Fri Nov 20 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-8
+* Fri Nov 20 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-8
- Fixed links to OpenMPI-1.10.1 libraries on Fedora
-* Fri Nov 20 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-7
+* Fri Nov 20 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-7
- Fixed links to OpenMPI-1.6.4 libraries on EPEL7
-* Wed Nov 18 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-6
+* Wed Nov 18 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-6
- Fixed links to OpenMPI-1.10 libraries
-* Mon Nov 16 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-5
+* Mon Nov 16 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-5
- Set MPI libraries by using pkgconfig
- ExcludeArch s390x s390
-* Fri Oct 30 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-4
+* Fri Oct 30 2015 Antonio Trande <sagitter(a)fedoraproject.org> - 5.0.1-4
- Hardened builds on <F23
* Tue Sep 15 2015 Orion Poplawski <orion(a)cora.nwra.com> - 5.0.1-3
commit 16b84a36d468eec242139d75b140e076afbf5987
Merge: 01f60b7 5db5525
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Dec 21 10:14:46 2019 +0100
Merge branch 'master' into epel7
commit 01f60b7f336aa4beaf70cd07750beda2599811f1
Merge: 409e52b aa2c520
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat May 18 14:35:43 2019 +0200
- Require scalapack explicity (rhbz #1711291 #1711289).
commit 409e52ba14e5209f834924f5bc644a8e05265451
Merge: c2b347e c6f2a6f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Sat Dec 2 16:52:51 2017 +0100
Update to 5.1.2
commit c2b347e5984f271ef39af2e25a10b7304b226edb
Merge: d0e9a58 1ce3139
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Nov 1 12:28:47 2016 +0100
Rebuilds
commit d0e9a5843d28ab62517c715426c64cffa1fe1409
Merge: e6d4f04 ec72b2f
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Jul 21 21:34:15 2016 +0200
Update to 5.0.2
commit e6d4f04d62987c12d4f0e164b98855833b9a43ac
Merge: f3eaf1d f3a7b82
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Apr 29 17:48:25 2016 +0200
Merge branch 'master' into epel7
commit f3eaf1ddc896f1736015fdb039e58c8068c1a81a
Merge: ade9d36 3f48e34
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Mar 24 11:29:48 2016 +0100
Examples directory moved under /usr/lib/openmpi(mpich)
commit ade9d365df9c6037048ec92d62a16b22f3be79c8
Merge: f9375a6 777d9ca
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Mar 23 14:34:55 2016 +0100
Fixed linker flags
commit f9375a6b804b2e3f71d652d26394feb864d084ab
Merge: 081c703 43c667c
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Mar 22 16:51:34 2016 +0100
Compiled with OpenMP support (bz#1319477)
commit 081c7032763c08867c047ddc83d3bb422ce65e43
Merge: b3b9d34 9267807
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Feb 12 20:38:49 2016 +0100
Merge branch 'master' into epel7
commit b3b9d3406ee2f0abb576aa711349428b9b7dcc6a
Merge: 6d17dcb 1077e07
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Jan 8 18:50:28 2016 +0100
- Built MPICH libraries on EPEL (bz#1296387)
- Exclude OpenMPI on s390 arches
- Exclude MPICH on PPC arches
- Built MPICH libraries (bz#1296387)
- Removed useless Requires packages
commit 6d17dcb52db45daac4a2c4fae10ad6f067a3e26e
Merge: 8e65dcc 91897d3
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Tue Nov 24 14:15:23 2015 +0100
Merge branch 'master' into epel7
commit 8e65dcc0be90b5a5df425d566a3b4fbb68c17a93
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Fri Nov 20 13:51:30 2015 +0100
Fixed links to OpenMPI-1.10 libraries
diff --git a/MUMPS-shared-seq.patch b/MUMPS-shared-seq.patch
index d918a7c..925fa44 100644
--- a/MUMPS-shared-seq.patch
+++ b/MUMPS-shared-seq.patch
@@ -36,7 +36,7 @@ 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.0.0.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) -lopen-rte -lopen-pal $(MPIFLIB) $(MPICLIB)
$(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.0.0.so $(OPTL) -Wl,-z,defs
+- $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-5.0.0.so $(OPTL) -Wl,-z,defs
+ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-5.0.0.so -Wl,-z,defs
ln -s libmumps_common$(PLAT)-5.0.0.so $@
@@ -45,8 +45,8 @@ Create a shared version of the sequential library, MUST BE LAST IN
SERIES
$(RANLIB) $@
$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER)
-- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(MUMPS_LIBF77) -lopen-rte -lopen-pal $(LORDERINGS) $(MPIFLIB)
$(METISLIB) -lblas $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL)
-Wl,-z,defs
-+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) -lblas $(SCALAP)
-o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.0.so -Wl,-z,defs
+- $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(LORDERINGS) $(MUMPS_LIBF77) $(LIBSEQ) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.0.so -Wl,-z,defs
ln -s lib$(ARITH)mumps$(PLAT)-5.0.0.so $@
diff --git a/MUMPS-shared.patch b/MUMPS-shared.patch
index 7bbdd15..55f5054 100644
--- a/MUMPS-shared.patch
+++ b/MUMPS-shared.patch
@@ -30,7 +30,7 @@ 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.0.0.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) -lopen-rte -lopen-pal $(MPIFLIB) $(MPICLIB)
$(METISLIB) -o $(libdir)/libmumps_common$(PLAT)-5.0.0.so $(OPTL) -Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,libmumps_common$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
$(LORDERINGS) -lpthread $(MUMPS_LIBF77) $(MPIFLIB) $(MPICLIB) $(METISLIB) -o
$(libdir)/libmumps_common$(PLAT)-5.0.0.so $(OPTL) -Wl,-z,defs
+ ln -s libmumps_common$(PLAT)-5.0.0.so $@
+
+$(libdir)/lib$(ARITH)mumps$(PLAT).a: $(OBJS_MOD) $(OBJS_OTHER)
@@ -38,7 +38,7 @@ Index: mumps/src/Makefile
$(RANLIB) $@
+$(libdir)/lib$(ARITH)mumps$(PLAT).so: $(OBJS_MOD) $(OBJS_OTHER)
-+ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(MUMPS_LIBF77) -lopen-rte -lopen-pal $(LORDERINGS) $(MPIFLIB)
$(METISLIB) -lblas $(SCALAP) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL)
-Wl,-z,defs
++ $(FC) -shared $^ -Wl,-soname,lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -L$(libdir)
-lmumps_common$(PLAT) $(MUMPS_LIBF77) $(LORDERINGS) $(MPIFLIB) $(METISLIB) $(SCALAP) -o
$(libdir)/lib$(ARITH)mumps$(PLAT)-5.0.0.so $(OPTL) -Wl,-z,defs
+ ln -s lib$(ARITH)mumps$(PLAT)-5.0.0.so $@
+
# Dependencies between modules:
diff --git a/MUMPS.spec b/MUMPS.spec
index 3468799..ee87353 100644
--- a/MUMPS.spec
+++ b/MUMPS.spec
@@ -17,7 +17,7 @@
Name: MUMPS
Version: 5.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: A MUltifrontal Massively Parallel sparse direct Solver
License: CeCILL-C
Group: Development/Libraries
@@ -138,30 +138,38 @@ cp -f %{SOURCE1} Makefile.inc
%global mpic_libs -L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} -lmpi
%endif
%if 0%{?rhel} && 0%{?rhel} >= 7
-%ifarch ppc64le
%global mpif77_cflags %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --cflags ompi-f77)
%global mpif77_libs %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --libs ompi-f77)
%global mpifort_cflags %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --cflags ompi-fort)
%global mpifort_libs %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --libs ompi-fort)
%global mpic_libs %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --libs ompi)
-%else
-%global mpif77_cflags -pthread -I%{_libmpidir} -I%{_incmpidir}
-%global mpif77_libs -L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} -lmpi_f77
-%global mpifort_cflags -pthread -I%{_libmpidir} -I%{_incmpidir}
-%global mpifort_libs -L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} -lmpi_f77
-%global mpic_libs -L%{_libmpidir} -Wl,-rpath -Wl,%{_libmpidir} -lmpi
%endif
+%ifarch ppc64le ppc64
+%global mpif77_cflags %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --cflags ompi-f77)
+%global mpif77_libs %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --libs ompi-f77)
+%global mpifort_cflags %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --cflags ompi-fort)
+%global mpifort_libs %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --libs ompi-fort)
+%global mpic_libs %(env PKG_CONFIG_PATH=%{_libdir}/openmpi/lib/pkgconfig
%{_bindir}/pkg-config --libs ompi)
%endif
# Set build flags macro
sed -e 's|@@CFLAGS@@|%{optflags} %{__global_ldflags} -Wl,-z,now -Dscotch -Dmetis
-Dptscotch|g' -i Makefile.inc
sed -e 's|@@-O@@|%{__global_ldflags} -Wl,-z,now -Wl,--as-needed|g' -i
Makefile.inc
-## EPEL7 still provides OpenMPI 1.6.4
-%if 0%{?rhel} && 0%{?rhel} < 7
-sed -e 's|@@MPIFORTRANLIB@@|%{mpif77_libs}|g' -i Makefile.inc
+%ifarch ppc64le ppc64
+sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -L%{_libdir} -lblas|g' -i
Makefile.inc
+%endif
+
+## EPEL6 provides OpenMPI 1.8.1
+## EPEL7 provides OpenMPI 1.6.4
+%if 0%{?rhel}
+sed -e 's|@@MPIFORTRANLIB@@|%{mpif77_libs} -lopen-rte -lopen-pal -L%{_libdir}
-lblas|g' -i Makefile.inc
+%endif
+
+%if 0%{?fedora} > 23
+sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -L%{_libdir} -lblas|g' -i
Makefile.inc
%else
-sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs}|g' -i Makefile.inc
+sed -e 's|@@MPIFORTRANLIB@@|%{mpifort_libs} -lopen-rte -lopen-pal -L%{_libdir}
-lblas|g' -i Makefile.inc
%endif
MUMPS_MPI=openmpi
@@ -355,7 +363,7 @@ install -cpm 755 examples/input_*
$RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{versio
%files common
%{!?_licensedir:%global license %doc}
-%doc examples/README-examples
+%doc examples/README-examples
%doc doc/*.pdf ChangeLog README
%license LICENSE
@@ -364,6 +372,9 @@ install -cpm 755 examples/input_*
$RPM_BUILD_ROOT%{_libexecdir}/%{name}-%{versio
%{_libexecdir}/%{name}-%{version}/examples/
%changelog
+* Wed Nov 18 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-6
+- Fixed links to OpenMPI-1.10 libraries
+
* Mon Nov 16 2015 Antonio Trande <sagitterATfedoraproject.org> - 5.0.1-5
- Set MPI libraries by using pkgconfig
- ExcludeArch s390x s390