[coin-or-Ipopt/f19: 7/7] Update to latest upstream release
pcpa
pcpa at fedoraproject.org
Thu Jul 10 03:16:18 UTC 2014
commit 95f305e7e4d6c30295a9e893e40ac41f8c51f85b
Author: pcpa <paulo.cesar.pereira.de.andrade at gmail.com>
Date: Thu Jul 10 00:13:36 2014 -0300
Update to latest upstream release
.gitignore | 1 +
coin-or-Ipopt-docdir.patch | 8 ++++----
coin-or-Ipopt-mumps.patch | 33 +++++++++++++++------------------
coin-or-Ipopt-pkgconfig.patch | 8 ++++----
coin-or-Ipopt-underlink.patch | 12 ++++++------
coin-or-Ipopt.spec | 26 ++++++++++++--------------
sources | 2 +-
7 files changed, 43 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 607c4fb..903457a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/Ipopt-3.11.0.tgz
+/Ipopt-3.11.8.tgz
diff --git a/coin-or-Ipopt-docdir.patch b/coin-or-Ipopt-docdir.patch
index 9f68d2d..3a3e9dd 100644
--- a/coin-or-Ipopt-docdir.patch
+++ b/coin-or-Ipopt-docdir.patch
@@ -1,7 +1,7 @@
-diff -up Ipopt-3.11.0/Makefile.in.orig Ipopt-3.11.0/Makefile.in
---- Ipopt-3.11.0/Makefile.in.orig 2013-05-11 12:24:29.042561718 -0300
-+++ Ipopt-3.11.0/Makefile.in 2013-05-11 12:25:06.362563147 -0300
-@@ -499,9 +499,9 @@ tmpdir = tmpdir
+diff -up Ipopt-3.11.8/Makefile.in.orig Ipopt-3.11.8/Makefile.in
+--- Ipopt-3.11.8/Makefile.in.orig 2014-07-09 23:19:53.470798935 -0300
++++ Ipopt-3.11.8/Makefile.in 2014-07-09 23:19:57.414799087 -0300
+@@ -502,9 +502,9 @@ tmpdir = tmpdir
libipopt = libipopt.a
pkgconfiglibdir = $(libdir)/pkgconfig
pkgconfiglib_DATA = ipopt.pc
diff --git a/coin-or-Ipopt-mumps.patch b/coin-or-Ipopt-mumps.patch
index 5c5d946..f75c2a6 100644
--- a/coin-or-Ipopt-mumps.patch
+++ b/coin-or-Ipopt-mumps.patch
@@ -1,27 +1,24 @@
-diff -up Ipopt-3.11.0/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp.orig Ipopt-3.11.0/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp
---- Ipopt-3.11.0/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp.orig 2013-05-11 12:37:24.854591427 -0300
-+++ Ipopt-3.11.0/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp 2013-05-11 12:37:38.689591957 -0300
-@@ -10,15 +10,7 @@
+diff -up Ipopt-3.11.8/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp.orig Ipopt-3.11.8/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp
+--- Ipopt-3.11.8/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp.orig 2014-07-09 23:21:29.088802597 -0300
++++ Ipopt-3.11.8/src/Algorithm/LinearSolvers/IpMumpsSolverInterface.cpp 2014-07-09 23:27:02.036815347 -0300
+@@ -10,11 +10,8 @@
// (major revision)
// (incorporated by AW on 2006-11-11 into Ipopt package)
--// The first header to include is the one for MPI. We need to make sure
--// that we are using C calling mangling
--extern "C"
--{
-- // The following line is a fix for otherwise twice-defined global variable
-- // (This would have to be taken out for a parallel MUMPS version!)
--# define MPI_COMM_WORLD IPOPT_MPI_COMM_WORLD
--# include "mpi.h"
--}
-+# include <mpi.h>
+-// The following line is a fix for otherwise twice-defined global variable
+-// (This would have to be taken out for a parallel MUMPS version!)
+-#define MPI_COMM_WORLD IPOPT_MPI_COMM_WORLD
+-// The first header to include is the one for MPI.
+-#include "mpi.h"
++#define OMPI_SKIP_MPICXX 1
++#include <mpi.h>
#include "IpMumpsSolverInterface.hpp"
-diff -up Ipopt-3.11.0/src/Interfaces/Makefile.in.orig Ipopt-3.11.0/src/Interfaces/Makefile.in
---- Ipopt-3.11.0/src/Interfaces/Makefile.in.orig 2013-04-13 12:46:45.000000000 -0300
-+++ Ipopt-3.11.0/src/Interfaces/Makefile.in 2013-05-11 12:37:38.692591957 -0300
-@@ -386,7 +386,7 @@ libipopt_la_DEPENDENCIES = $(IPALLLIBS)
+diff -up Ipopt-3.11.8/src/Interfaces/Makefile.in.orig Ipopt-3.11.8/src/Interfaces/Makefile.in
+--- Ipopt-3.11.8/src/Interfaces/Makefile.in.orig 2014-07-09 23:22:07.832804081 -0300
++++ Ipopt-3.11.8/src/Interfaces/Makefile.in 2014-07-09 23:22:11.020804203 -0300
+@@ -391,7 +391,7 @@ libipopt_la_DEPENDENCIES = $(IPALLLIBS)
libipopt_la_LDFLAGS = $(LT_LDFLAGS)
# This line is necessary to allow VPATH compilation
diff --git a/coin-or-Ipopt-pkgconfig.patch b/coin-or-Ipopt-pkgconfig.patch
index 4b5c10f..11fa644 100644
--- a/coin-or-Ipopt-pkgconfig.patch
+++ b/coin-or-Ipopt-pkgconfig.patch
@@ -1,7 +1,7 @@
-diff -up Ipopt-3.11.0/Makefile.in.orig Ipopt-3.11.0/Makefile.in
---- Ipopt-3.11.0/Makefile.in.orig 2013-04-22 15:49:20.000000000 -0300
-+++ Ipopt-3.11.0/Makefile.in 2013-05-11 12:24:29.042561718 -0300
-@@ -1077,7 +1077,7 @@ astyle:
+diff -up Ipopt-3.11.8/Makefile.in.orig Ipopt-3.11.8/Makefile.in
+--- Ipopt-3.11.8/Makefile.in.orig 2014-07-09 23:18:32.984795853 -0300
++++ Ipopt-3.11.8/Makefile.in 2014-07-09 23:18:43.911796272 -0300
+@@ -1080,7 +1080,7 @@ astyle:
# since pkg-config may have reordered the flags from FLIBS, we take them out one by one
install-data-hook:
@$(mkdir_p) "$(addlibsdir)"
diff --git a/coin-or-Ipopt-underlink.patch b/coin-or-Ipopt-underlink.patch
index b9d8f15..17c3382 100644
--- a/coin-or-Ipopt-underlink.patch
+++ b/coin-or-Ipopt-underlink.patch
@@ -1,12 +1,12 @@
-diff -up Ipopt-3.11.0/src/Interfaces/Makefile.in.orig Ipopt-3.11.0/src/Interfaces/Makefile.in
---- Ipopt-3.11.0/src/Interfaces/Makefile.in.orig 2013-05-11 12:42:30.352603125 -0300
-+++ Ipopt-3.11.0/src/Interfaces/Makefile.in 2013-05-11 12:42:34.722603293 -0300
-@@ -381,7 +381,7 @@ libipopt_la_SOURCES = \
+diff -up Ipopt-3.11.8/src/Interfaces/Makefile.in.orig Ipopt-3.11.8/src/Interfaces/Makefile.in
+--- Ipopt-3.11.8/src/Interfaces/Makefile.in.orig 2014-07-09 23:28:58.312819799 -0300
++++ Ipopt-3.11.8/src/Interfaces/Makefile.in 2014-07-09 23:29:08.476820189 -0300
+@@ -386,7 +386,7 @@ libipopt_la_SOURCES = \
IpTNLPAdapter.cpp IpTNLPAdapter.hpp \
IpTNLPReducer.cpp IpTNLPReducer.hpp
--libipopt_la_LIBADD = $(IPALLLIBS)
-+libipopt_la_LIBADD = $(IPALLLIBS) -ldl
+-libipopt_la_LIBADD = $(IPALLLIBS) $(am__append_1)
++libipopt_la_LIBADD = $(IPALLLIBS) $(am__append_1) -ldl
libipopt_la_DEPENDENCIES = $(IPALLLIBS)
libipopt_la_LDFLAGS = $(LT_LDFLAGS)
diff --git a/coin-or-Ipopt.spec b/coin-or-Ipopt.spec
index d6b59f1..097c0eb 100644
--- a/coin-or-Ipopt.spec
+++ b/coin-or-Ipopt.spec
@@ -1,21 +1,10 @@
%global module Ipopt
-%if 0%{?fedora} < 20
-%global lmpi_f77 -lmpi_f77
-%else
-%global lmpi_f77 -lmpi_mpifh
-%endif
-
-%if 0%{?fedora} >= 21
-%global lmpiblacs "-lmpiblacs"
-%else
-%global lmpiblacs "-lmpiblacs -lmpiblacsF77init -lmpiblacsCinit"
-%endif
Name: coin-or-%{module}
Group: Applications/Engineering
Summary: Interior Point OPTimizer
-Version: 3.11.0
-Release: 6%{?dist}
+Version: 3.11.8
+Release: 1%{?dist}
License: EPL and GPLv2+
URL: https://projects.coin-or.org/%{module}
Source0: http://www.coin-or.org/download/pkgsource/%{module}/%{module}-%{version}.tgz
@@ -69,6 +58,7 @@ corresponding components of g_L and g_U to the same value.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: coin-or-CoinUtils-devel
+Requires: MUMPS-devel
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -92,9 +82,11 @@ This package contains the documentation for %{name}.
%patch3 -p1
%build
+CFLAGS="%{optflags} -DHAVE_MPI_INITIALIZED=1"
+CXXFLAGS="%{optflags} -DHAVE_MPI_INITIALIZED=1"
%_openmpi_load
%configure \
- --with-mumps-lib="-ldmumps -L$MPI_LIB -lmpi -lscalapack -llapack %{lmpiblacs} %{lmpi_f77} -lmpi_cxx" \
+ --with-mumps-lib="-ldmumps" \
--with-mumps-incdir=%{_includedir}/MUMPS
# Kill rpaths
@@ -141,6 +133,12 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH make test
%{_docdir}/%{name}/html
%changelog
+* Wed Jul 9 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.11.8-1
+- Add missing requires to MUMPS-devel in the devel package
+- Do not explicitly link to openmpi
+- Update to version that corrects #1117974
+- Update to latest upstream release (#1089927)
+
* Fri Jun 13 2014 pcpa <paulo.cesar.pereira.de.andrade at gmail.com> - 3.11.0-6
- Adapt to newer scalapack correcting rawhide FTBFS (#1106072)
diff --git a/sources b/sources
index 5a040fc..de929ca 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ba46f1b4feb0302f0e7d9c9495491e75 Ipopt-3.11.0.tgz
+c56ec9a307cfc92ecbd61bee5c447c77 Ipopt-3.11.8.tgz
More information about the scm-commits
mailing list