[coin-or-Ipopt/f19] Update to recent MUMPS changes

pcpa pcpa at fedoraproject.org
Thu Jul 10 04:03:36 UTC 2014


commit d9e9c63aabe395048d5d867fbae89b218eddd2bd
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date:   Thu Jul 10 01:03:21 2014 -0300

    Update to recent MUMPS changes

 coin-or-Ipopt.spec |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec
index 097c0eb..3578c2b 100644
--- a/coin-or-Ipopt.spec
+++ b/coin-or-Ipopt.spec
@@ -17,6 +17,9 @@ BuildRequires:	glpk-devel
 BuildRequires:	graphviz
 BuildRequires:	lapack-devel
 BuildRequires:	MUMPS-devel
+%if 0%{?fedora} >= 21
+BuildRequires:	MUMPS-openmpi-devel
+%endif
 BuildRequires:	openmpi-devel
 BuildRequires:	scalapack-openmpi-devel
 BuildRequires:	openssh-clients
@@ -59,6 +62,9 @@ Summary:	Development files for %{name}
 Group:		Development/Libraries
 Requires:	coin-or-CoinUtils-devel
 Requires:	MUMPS-devel
+%if 0%{?fedora} >= 21
+Requires:	MUMPS-openmpi-devel
+%endif
 Requires:	%{name}%{?_isa} = %{version}-%{release}
 
 %description    devel
@@ -86,7 +92,11 @@ CFLAGS="%{optflags} -DHAVE_MPI_INITIALIZED=1"
 CXXFLAGS="%{optflags} -DHAVE_MPI_INITIALIZED=1"
 %_openmpi_load
 %configure							\
+%if 0%{?fedora} >= 21
+	--with-mumps-lib="-L$MPI_LIB -ldmumps"			\
+%else
 	--with-mumps-lib="-ldmumps"				\
+%endif
 	--with-mumps-incdir=%{_includedir}/MUMPS
 
 # Kill rpaths


More information about the scm-commits mailing list