[freefempp] 14/23: Enable unapply/apply patches during autoreconf clean/autoreconf
Dimitrios Eftaxiopoulos
eftaxiop-guest at alioth.debian.org
Wed Sep 11 21:37:10 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 3b306214a53bed5affbd8ed181b9d4786a732469
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Sep 9 00:17:35 2013 +0300
Enable unapply/apply patches during autoreconf clean/autoreconf
---
.gitignore | 5 +-
debian/patches/configure-ac.patch | 11 ----
debian/patches/series | 1 -
debian/rules | 16 +++---
download/gmm/cxxflags | 14 ++---
examples++-3d/all.edp | 108 ++++++++++++++++++-------------------
src/fflib/strversionnumber.cpp | 4 +-
7 files changed, 75 insertions(+), 84 deletions(-)
diff --git a/.gitignore b/.gitignore
index fb49149..ddfeef6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,8 +32,10 @@ examples++-3d/all.edp
examples++-bug/Makefile.in.orig
examples++-chapt3/Makefile.in.orig
examples++-eigen/Makefile.in.orig
+examples++-eigen/freefem++.pref
examples++-bug/Makefile.in
examples++-chapt3/Makefile.in
+examples++-chapt3/freefem++.pref
examples++-eigen/Makefile.in
examples++-load/all.edp
examples++-load/Makefile.in.orig
@@ -46,12 +48,13 @@ examples++-load/WHERE_LIBRARY-download-new
examples++-mpi/Makefile.in.orig
examples++-other/Makefile.in.orig
examples++-tutorial/Makefile.in.orig
-examples++/Makefile.in.orig
examples++-mpi/Makefile.in
examples++-mpi/Missing-plugins-so.log
examples++-other/Makefile.in
examples++-tutorial/Makefile.in
examples++/Makefile.in
+examples++/Makefile.in.orig
+examples++/freefem++.pref
install-sh
missing
mkinstalldirs
diff --git a/debian/patches/configure-ac.patch b/debian/patches/configure-ac.patch
deleted file mode 100644
index 9fde90e..0000000
--- a/debian/patches/configure-ac.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1902,7 +1902,7 @@
- [[Superlu4],[-lsuperlu4],[superlu4/slu_ddefs.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],[metis/metis.h],[]],
- [[metis],[-lscotch -lmetis],[metis.h],[]],
diff --git a/debian/patches/series b/debian/patches/series
index 4538f96..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-configure-ac.patch
diff --git a/debian/rules b/debian/rules
index 21eaf33..12e8d89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,7 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
%:
dh $@ --with autoreconf --parallel
-# export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
+export OMPI_MCA_plm_rsh_agent=/bin/false #workaround to start MPI-applications in chroot
#
# # to avoid lintian warnings
# CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
@@ -69,13 +69,13 @@ LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
# find . -name \*.so | xargs --no-run-if-empty rm
#
-# override_dh_autoreconf_clean:
-# dh_autoreconf_clean
-# dh_quilt_unpatch
-#
-# override_dh_autoreconf:
-# dh_quilt_patch
-# dh_autoreconf --as-needed
+override_dh_autoreconf_clean:
+ dh_autoreconf_clean
+ dh_quilt_unpatch
+
+override_dh_autoreconf:
+ dh_quilt_patch
+ dh_autoreconf --as-needed
override_dh_auto_configure:
dh_auto_configure -- CC="gcc $(LDFLAGS)" CXX="g++ $(LDFLAGS)" MPICXX="mpic++ $(LDFLAGS)"
diff --git a/download/gmm/cxxflags b/download/gmm/cxxflags
index e805e18..2ad8048 100644
--- a/download/gmm/cxxflags
+++ b/download/gmm/cxxflags
@@ -1,12 +1,12 @@
-CXX = clang++ -std=c++11
-MPICXX =
+CXX = g++ -Wl,-z,relro
+MPICXX = mpic++ -Wl,-z,relro
ac_ct_CXX =
-CC = clang
-MPICC =
+CC = gcc -Wl,-z,relro
+MPICC = /usr/bin/mpicc
YACC = bison -y
-ac_ct_CC = clang
-CXXFLAGS = -g -m64 -fPIC -g -DBAMG_LONG_LONG -DCHECK_KN -fno-inline -fexceptions -fPIC
-CFLAGS = -g -m64 -fPIC -g -fPIC
+ac_ct_CC = gcc -Wl,-z,relro
+CXXFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -DBAMG_LONG_LONG -DNCHECKPTR -fPIC
+CFLAGS = -g -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
FCFLAGS = -g -O2 -fPIC
FFMETIS_CFLAGS =
WGET = wget --no-check-certificate
diff --git a/examples++-3d/all.edp b/examples++-3d/all.edp
index d3677d2..8899490 100644
--- a/examples++-3d/all.edp
+++ b/examples++-3d/all.edp
@@ -7,105 +7,97 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "ArrayFE-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;searchMethod=0;
-{ include "EqPoisson.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
-verbosity=verbosityy;searchMethod=0;
-{ include "Lac.edp";};
- cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace-Adapt-3d.edp";};
+{ include "beam-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace-Adapt-aniso-3d.edp";};
+{ include "cone.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Laplace3d.edp";};
+{ include "convect-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "LaplaceRT-3d.edp";};
+{ include "cube-period.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "NSI3d-carac.edp";};
+{ include "cylinder-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "NSI3d.edp";};
+{ include "cylinder.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : EqPoisson.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Period-Poisson-cube-ballon.edp";};
+{ include "EqPoisson.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson-cube-ballon.edp";};
+{ include "fallingspheres.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : first.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson.edp";};
+{ include "first.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Lac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Poisson3d.edp";};
+{ include "Lac.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "Stokes.edp";};
+{ include "Laplace3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace-Adapt-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "TruncLac.edp";};
+{ include "Laplace-Adapt-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : beam-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Laplace-Adapt-aniso-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "beam-3d.edp";};
+{ include "Laplace-Adapt-aniso-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cone.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : LaplaceRT-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cone.edp";};
+{ include "LaplaceRT-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : convect-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "convect-3d.edp";};
+{ include "meditddm.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cube-period.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : NSI3d-carac.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cube-period.edp";};
+{ include "NSI3d-carac.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cylinder-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : NSI3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cylinder-3d.edp";};
+{ include "NSI3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : cylinder.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : p.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "cylinder.edp";};
+{ include "p.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : fallingspheres.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "fallingspheres.edp";};
+{ include "periodic-3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : first.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Period-Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "first.edp";};
+{ include "Period-Poisson-cube-ballon.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : meditddm.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson3d.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "meditddm.edp";};
+{ include "Poisson3d.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : p.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson-cube-ballon.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "p.edp";};
+{ include "Poisson-cube-ballon.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
- cout << "--------- file : periodic-3d.edp --------------------------------------------------------" << endl;
+ cout << "--------- file : Poisson.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
-{ include "periodic-3d.edp";};
+{ include "Poisson.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : pyramide.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
@@ -127,6 +119,10 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "sphere6.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : Stokes.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "Stokes.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
cout << "--------- file : tetgencube.edp --------------------------------------------------------" << endl;
verbosity=verbosityy;searchMethod=0;
{ include "tetgencube.edp";};
@@ -135,3 +131,7 @@ verbosity=verbosityy;searchMethod=0;
verbosity=verbosityy;searchMethod=0;
{ include "tetgenholeregion.edp";};
cout << "------------------------------------------------------------------------------ " << endl;
+ cout << "--------- file : TruncLac.edp --------------------------------------------------------" << endl;
+verbosity=verbosityy;searchMethod=0;
+{ include "TruncLac.edp";};
+ cout << "------------------------------------------------------------------------------ " << endl;
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 2db57a9..8897b60 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 Jeu 5 sep 2013 10:54:38 CEST)",VersionNumber());
- return buffer; //.str()+" (date Jeu 5 sep 2013 10:54:38 CEST)" ;
+ sprintf(buffer," %9f (date Κυρ 08 Σεπ 2013 11:04:19 μμ EEST)",VersionNumber());
+ return buffer; //.str()+" (date Κυρ 08 Σεπ 2013 11:04:19 μμ 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