[freefempp] 01/02: Enable build with metis
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Sun Dec 22 21:34:58 UTC 2013
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit 03ca3b8e06fb2edef50f9d7337472c4dc58438da
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Sun Dec 22 22:58:51 2013 +0200
Enable build with metis
---
debian/patches/configure.patch | 16 ++++++++++++++--
src/fflib/strversionnumber.cpp | 4 ++--
2 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/debian/patches/configure.patch b/debian/patches/configure.patch
index 7ce292e..3026178 100644
--- a/debian/patches/configure.patch
+++ b/debian/patches/configure.patch
@@ -1,12 +1,24 @@
Fix compilation issues related to libraries and flags
--- a/configure.ac
+++ b/configure.ac
-@@ -1744,7 +1744,7 @@
+@@ -62,7 +62,7 @@
+ echo "$1 LD $2" >>$ff_where_lib_conf
+ ff_WHERE_INC=`AS_DIRNAME(["$3"])`
+ case "$ff_WHERE_INC" in
+- /*)e cho "$1 INCLUDE -I$ff_WHERE_INC" >>$ff_where_lib_conf ;;
++ /*)echo "$1 INCLUDE -I$ff_WHERE_INC" >>$ff_where_lib_conf ;;
+ esac
+ fi
+ AC_MSG_RESULT($ff_WHERE)
+@@ -1744,9 +1744,9 @@
[[Superlu4],[-lsuperlu4],[/usr/include/superlu4/superlu_enum_consts.h],[]],
[[blacs],[ -lblacsCinit$ff_with_mpi -lblacsF77init$ff_with_mpi -lblacs$ff_with_mpi],[]],
[[scalapack],[-lscalapack$ff_with_mpi],[]],
- [[scotch],[-lscotch -lscotcherr],[]],
+ [[scotch],[-lscotch -lscotcherr],[/usr/include/scotch/scotch.h][]],
[[ptscotch],[-lptscotch -lptscotcherr],[]],
- [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
+- [[metis],[-lscotch -lmetis],[/usr/include/metis/metis.h],[]],
++ [[metis],[-lscotch -lmetis],[/usr/include/metis.h],[]],
[[metis],[-lscotch -lmetis],[metis.h],[]],
+ [[parmetis],[-lptscotch -lparmetis],[],[]],
+ [[freeyams],[-lfreeyams],[freeyamslib.h],[]],
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 3e82f9f..eccf746 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 Πεμ 19 Δεκ 2013 08:27:13 μμ EET)",VersionNumber());
- return buffer; //.str()+" (date Πεμ 19 Δεκ 2013 08:27:13 μμ EET)" ;
+ sprintf(buffer," %9f (date Κυρ 22 Δεκ 2013 10:46:44 μμ EET)",VersionNumber());
+ return buffer; //.str()+" (date Κυρ 22 Δεκ 2013 10:46:44 μμ EET)" ;
}
--
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