[freefempp] 16/23: Apply Cristoph's examples++-load.patch
Dimitrios Eftaxiopoulos
eftaxiop-guest at alioth.debian.org
Wed Sep 11 21:37:11 UTC 2013
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch eftaxiop
in repository freefempp.
commit 1af1ccf0388a83642f3fa43cca6674b2d475532c
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Tue Sep 10 17:40:30 2013 +0300
Apply Cristoph's examples++-load.patch
---
debian/patches/examples++-load.patch | 72 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
src/fflib/strversionnumber.cpp | 4 +-
3 files changed, 75 insertions(+), 2 deletions(-)
diff --git a/debian/patches/examples++-load.patch b/debian/patches/examples++-load.patch
new file mode 100644
index 0000000..89ae944
--- /dev/null
+++ b/debian/patches/examples++-load.patch
@@ -0,0 +1,72 @@
+Add ability to compile freefem++ with Ipopt, freeyams, mmg3d_v4, mshmet, mumps_seq and superlu4
+--- a/examples++-load/ff-Ipopt.cpp
++++ b/examples++-load/ff-Ipopt.cpp
+@@ -23,7 +23,11 @@
+ along with Freefem++; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+-//ff-c++-LIBRARY-dep: Ipopt mumps-seq blas libseq fc
++//ff-c++-LIBRARY-dep: Ipopt
++
++#ifndef HAVE_CSTDDEF
++#define HAVE_CSTDDEF
++#endif
+
+ //using namespace std;
+ #include "IpTNLP.hpp"
+--- a/examples++-load/MUMPS_seq.cpp
++++ b/examples++-load/MUMPS_seq.cpp
+@@ -38,7 +38,7 @@
+
+ #include "ff++.hpp"
+
+-#include "mpi.h"
++#include "mumps_seq/mpi.h"
+ #include "dmumps_c.h"
+ #include "zmumps_c.h"
+
+--- a/examples++-load/mmg3d-v4.0.cpp
++++ b/examples++-load/mmg3d-v4.0.cpp
+@@ -10,7 +10,7 @@
+
+ //
+ // for automatic compilation with ff-c++
+-//ff-c++-LIBRARY-dep: mmg3d-v4
++//ff-c++-LIBRARY-dep: mmg3d_v4
+ //ff-c++-cpp-dep:
+ //
+
+--- a/examples++-load/SuperLu.cpp
++++ b/examples++-load/SuperLu.cpp
+@@ -1,7 +1,7 @@
+ // for automatic compilation with ff-c++
+-//ff-c++-LIBRARY-dep: superlu blas
++//ff-c++-LIBRARY-dep: Superlu4 blas
+ //ff-c++-cpp-dep:
+-// for Super4.0 library
++// for Super4.0 library
+ #include "ff++.hpp"
+ /*
+ #include <iostream>
+--- a/examples++-load/mshmet.cpp
++++ b/examples++-load/mshmet.cpp
+@@ -8,7 +8,7 @@
+ // E-MAIL : jacques.morice at ann.jussieu.fr
+ //
+ // for automatic compilation with ff-c++
+-//ff-c++-LIBRARY-dep: mshmet libMesh
++//ff-c++-LIBRARY-dep: mshmet
+ //ff-c++-cpp-dep:
+ //
+
+--- a/examples++-load/freeyams.cpp
++++ b/examples++-load/freeyams.cpp
+@@ -8,7 +8,7 @@
+ // E-MAIL : jacques.morice at ann.jussieu.fr
+ //
+ // for automatic compilation with ff-c++
+-//ff-c++-LIBRARY-dep: freeyams libMesh
++//ff-c++-LIBRARY-dep: freeyams
+ //ff-c++-cpp-dep:
+ //
+
diff --git a/debian/patches/series b/debian/patches/series
index 37a4b42..eeeca8c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+examples++-load.patch
configure.patch
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 18f5a95..77322b5 100644
--- a/src/fflib/strversionnumber.cpp
+++ b/src/fflib/strversionnumber.cpp
@@ -18,6 +18,6 @@ string StrVersionNumber(){
// buffer.precision(8);
// buffer<<VersionNumber();
static char buffer[100];
- sprintf(buffer," %9f (date Τρι 10 Σεπ 2013 04:42:28 μμ EEST)",VersionNumber());
- return buffer; //.str()+" (date Τρι 10 Σεπ 2013 04:42:28 μμ EEST)" ;
+ sprintf(buffer," %9f (date Τρι 10 Σεπ 2013 05:36:32 μμ EEST)",VersionNumber());
+ return buffer; //.str()+" (date Τρι 10 Σεπ 2013 05:36:32 μμ EEST)" ;
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freefempp.git
More information about the debian-science-commits
mailing list