[MUMPS] Fix bz#986708

Antonio Trande sagitter at fedoraproject.org
Tue Jul 23 13:45:34 UTC 2013


commit 772ab2bfb94decf73f76d1aa8f9e742b855425c1
Author: sagitter <sagitter at fedoraproject.org>
Date:   Tue Jul 23 15:45:04 2013 +0200

    Fix bz#986708

 MUMPS-Makefile.par.inc |    2 +-
 MUMPS.spec             |   13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/MUMPS-Makefile.par.inc b/MUMPS-Makefile.par.inc
index 7e691f9..282cdd9 100644
--- a/MUMPS-Makefile.par.inc
+++ b/MUMPS-Makefile.par.inc
@@ -77,7 +77,7 @@ SCALAP  = -lscalapack -lmpiblacs
 #INCPAR = -I/usr/local/include
 INCPAR = $(MUMPS_INCDIR)
 #LIBPAR = $(SCALAP)  -L/usr/local/lib/ -llammpio -llamf77mpi -lmpi -llam -lutil -ldl -lpthread
-MPIFLIB = -lmpi_f77
+MPIFLIB = -lmpi_mpifh
 MPICLIB = -lmpi
 LIBPAR = $(SCALAP) $(MPIFLIB) 
 # See point 17 in the FAQ to have more details on the compilation of mpich with gfortran
diff --git a/MUMPS.spec b/MUMPS.spec
index a369ef6..dd0eead 100644
--- a/MUMPS.spec
+++ b/MUMPS.spec
@@ -1,6 +1,6 @@
 Name: MUMPS
 Version: 4.10.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A MUltifrontal Massively Parallel sparse direct Solver
 License: Public Domain
 Group: Development/Libraries
@@ -18,7 +18,7 @@ Patch1: %{name}-shared-pord.patch
 Patch2: %{name}-shared.patch
 
 BuildRequires: gcc-gfortran, blas-devel, lapack-devel
-BuildRequires: openmpi-devel, scalapack-openmpi-devel, blacs-openmpi-devel
+BuildRequires: openmpi-devel >= 1.7.2, scalapack-openmpi-devel, blacs-openmpi-devel >= 1.1-50
 BuildRequires: openssh-clients
 
 %description
@@ -74,8 +74,8 @@ MUMPS_INCDIR=-I/usr/include/openmpi-%{_arch}
 
 MUMPS_LIBF77="\
 -L%{_libdir}/openmpi -L%{_libdir}/openmpi/lib \
--lmpi_f77 -lmpi -lscalapack -lmpiblacs \
--lmpiblacsF77init -lmpiblacsCinit -llapack"
+ -lmpi -lmpi_mpifh -lscalapack -lmpiblacs \
+ -lmpiblacsF77init -lmpiblacsCinit -llapack"
 
 make MUMPS_MPI="$MUMPS_MPI" \
      MUMPS_INCDIR="$MUMPS_INCDIR" \
@@ -161,6 +161,11 @@ install -cpm 755 examples/input_* $RPM_BUILD_ROOT%{_libdir}/%{name}-examples
 
 
 %changelog
+* Tue Jul 23 2013 Antonio Trande <sagitter at fedoraproject.org> - 4.10.0-10
+- 'openmpi-devel' BR changed to 'openmpi-devel>=1.7'
+- 'blacs-openmpi-devel' BR changed to 'blacs-openmpi-devel>=1.1-50'
+- Removed '-lmpi_f77' library link, deprecated starting from 'openmpi-1.7.2'
+
 * Sat Mar 23 2013 Antonio Trande <sagitter at fedoraproject.org> - 4.10.0-9
 - Removed '-Wuninitialized -Wno-maybe-uninitialized' flags because unrecognized
   in EPEL6


More information about the scm-commits mailing list