[freefempp] 07/09: Fix architecture name for hurd-i386
Dimitrios Eftaxiopoulos
eftaxiop-guest at moszumanska.debian.org
Sun Apr 24 22:09:02 UTC 2016
This is an automated email from the git hooks/post-receive script.
eftaxiop-guest pushed a commit to branch master
in repository freefempp.
commit 364c92954cb75f43b9904db8344e72fb9a9fb364
Author: Dimitrios Eftaxiopoulos <eftaxi12 at otenet.gr>
Date: Mon Apr 25 00:42:41 2016 +0300
Fix architecture name for hurd-i386
---
Makefile.am | 2 +-
configure.ac | 6 +++++-
debian/patches/examples++-load.patch | 4 ++--
download/arpack/Makefile | 2 +-
download/blas/Makefile | 2 +-
download/fftw/Makefile | 2 +-
download/umfpack/Makefile | 2 +-
examples++-3d/Makefile.am | 2 +-
examples++-chapt3/Makefile.am | 2 +-
examples++-eigen/Makefile.am | 2 +-
examples++-load/Makefile.am | 6 +++---
examples++-load/load.link.in | 2 +-
examples++-tutorial/Makefile.am | 2 +-
examples++/Makefile.am | 2 +-
examples-bamg/test/dotest.pl | 2 +-
src/fflib/Makefile.am | 2 +-
src/fflib/strversionnumber.cpp | 4 ++--
src/medit/Makefile.am | 2 +-
18 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index c7fa139..6979e3e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@
# $Id$
-SUBDIRS=download src examples++-load examples++-mpi \
+SUBDIRS= src examples++-load examples++-mpi \
examples++-tutorial examples++ \
examples++-eigen \
examples++-bug examples++-chapt3 examples++-other \
diff --git a/configure.ac b/configure.ac
index 00fa8b3..9c11565 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,8 +128,12 @@ m4_define([TOOL_DISABLE],
TOOL_PARAMETERS($1,$2,$3)
])
+SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
+FF_DATE=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%Y-%m-%d" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+%Y-%m-%d" 2>/dev/null || date -u "+%Y-%m-%d")
+AC_SUBST(FF_DATE,$FF_DATE)
+
ff_HOSTARCH_pastix=
-echo "# Build with freefem++ with ./configure " `date` >$ff_where_lib_conf
+echo "# Build with freefem++ with ./configure $FF_DATE" >$ff_where_lib_conf
# To allow anonymous CVS version to contain a "./configure" and
# Makefiles
diff --git a/debian/patches/examples++-load.patch b/debian/patches/examples++-load.patch
index e0b7f1a..c956401 100644
--- a/debian/patches/examples++-load.patch
+++ b/debian/patches/examples++-load.patch
@@ -1,7 +1,7 @@
Add arch names for build on them to succeed and locations for include and preference files
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
-@@ -220,8 +220,8 @@
+@@ -222,8 +222,8 @@
sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
done
echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
@@ -19,7 +19,7 @@ Add arch names for build on them to succeed and locations for include and prefer
# SUF=dll
;;
- FreeBSD|NetBSD)
-+ FreeBSD|NetBSD|GNU/kFreeBSD)
++ FreeBSD|NetBSD|GNU|GNU/kFreeBSD)
SHARED="-shared"
FLAGS='-fPIC';;
# 64 bit Linux needs -fPIC (ALH)
diff --git a/download/arpack/Makefile b/download/arpack/Makefile
index 891a505..164b992 100644
--- a/download/arpack/Makefile
+++ b/download/arpack/Makefile
@@ -228,7 +228,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Sun Apr 24 23:47:18 EEST 2016
+FF_DATE = Mon Apr 25 00:36:11 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/blas/Makefile b/download/blas/Makefile
index bf001f5..4acbb29 100644
--- a/download/blas/Makefile
+++ b/download/blas/Makefile
@@ -485,7 +485,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Sun Apr 24 23:47:18 EEST 2016
+FF_DATE = Mon Apr 25 00:36:11 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/fftw/Makefile b/download/fftw/Makefile
index caad916..51301fb 100644
--- a/download/fftw/Makefile
+++ b/download/fftw/Makefile
@@ -179,7 +179,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Sun Apr 24 23:47:18 EEST 2016
+FF_DATE = Mon Apr 25 00:36:11 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/download/umfpack/Makefile b/download/umfpack/Makefile
index 5e46623..5526f91 100644
--- a/download/umfpack/Makefile
+++ b/download/umfpack/Makefile
@@ -199,7 +199,7 @@ FCFLAGS = -g -O2 -fstack-protector-strong -fPIC
FFGLUTNAME =
FFGLUTPROG = ffglut
FFLAGS = -g -fstack-protector-strong -DNDEBUG -O3 -mmmx -msse -msse2 -fPIC
-FF_DATE = Sun Apr 24 23:47:18 EEST 2016
+FF_DATE = Mon Apr 25 00:36:11 EEST 2016
FF_HAVE_REGEX_H = 1
FF_LAPACKdir =
FF_MALLOC_H = 1
diff --git a/examples++-3d/Makefile.am b/examples++-3d/Makefile.am
index aa9f927..35f067c 100644
--- a/examples++-3d/Makefile.am
+++ b/examples++-3d/Makefile.am
@@ -16,7 +16,7 @@ EXTRA_DIST=*.edp all.edp regtests.edp regtests.m4 ref.edp dodecaedre01.mesh \
all.edp: Makefile
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();"; \
- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;searchMethod=0;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++-chapt3/Makefile.am b/examples++-chapt3/Makefile.am
index ca1be28..a463d22 100644
--- a/examples++-chapt3/Makefile.am
+++ b/examples++-chapt3/Makefile.am
@@ -11,7 +11,7 @@ TESTS_ENVIRONMENT=TEST_FFPP=$(TEST_FFPP) FLAGS_FFPP=-nw
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++-eigen/Makefile.am b/examples++-eigen/Makefile.am
index 7935374..532e3f1 100644
--- a/examples++-eigen/Makefile.am
+++ b/examples++-eigen/Makefile.am
@@ -11,7 +11,7 @@ EXTRA_DIST=*.edp all.edp
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++-load/Makefile.am b/examples++-load/Makefile.am
index ca982a2..15f5623 100644
--- a/examples++-load/Makefile.am
+++ b/examples++-load/Makefile.am
@@ -165,7 +165,7 @@ all-local: all.edp regtests.edp load_compile
all.edp:
@(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
if ../src/nw/FreeFem++ -ns -jc -v 0 $$i 1>/dev/null 2>/dev/null ; then \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
@@ -222,8 +222,8 @@ install-exec-local:: load_compile WHERE_LIBRARY
sed <$$i >$(DESTDIR)$(ff_prefix_dir)/lib/$$i 's#$(abs_top_builddir)/download#$(ff_prefix_dir)#' ;\
done
echo loadpath += \"./\" >$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo loadpath += \"$(ff_prefix_dir)/lib\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
- echo includepath += \"$(ff_prefix_dir)/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo loadpath += \"$(prefix)/lib/freefem++\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
+ echo includepath += \"$(prefix)/include/freefem++/idp\" >>$(DESTDIR)$(ff_prefix_dir)/etc/freefem++.pref
$(INSTALL_SCRIPT) ff-c++ $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-pkg-download $(DESTDIR)${bindir}
$(INSTALL_SCRIPT) ff-get-dep $(DESTDIR)${bindir}
diff --git a/examples++-load/load.link.in b/examples++-load/load.link.in
index b680273..3911af9 100755
--- a/examples++-load/load.link.in
+++ b/examples++-load/load.link.in
@@ -227,7 +227,7 @@ case "$WIN32$uu" in
LIBS="'$b/libff.dll' $LIBS $DLL"
# SUF=dll
;;
- FreeBSD|NetBSD)
+ FreeBSD|NetBSD|GNU|GNU/kFreeBSD)
SHARED="-shared"
FLAGS='-fPIC';;
# 64 bit Linux needs -fPIC (ALH)
diff --git a/examples++-tutorial/Makefile.am b/examples++-tutorial/Makefile.am
index 07fd294..4fa0dd1 100644
--- a/examples++-tutorial/Makefile.am
+++ b/examples++-tutorial/Makefile.am
@@ -12,7 +12,7 @@ EXTRA_DIST=*.edp *.idp aile.msh xyf all.edp regtests.edp regtests.m4 ref.edp
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples++/Makefile.am b/examples++/Makefile.am
index 7215bb0..37fe0ce 100644
--- a/examples++/Makefile.am
+++ b/examples++/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST=*.edp all.edp regtests.edp regtests.m4 ref.edp
all.edp:
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
- for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
+ for i in `LC_ALL=C ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
echo "verbosity=verbosityy;" ; \
echo \{ include \"$$i\"\;\}\; ;\
diff --git a/examples-bamg/test/dotest.pl b/examples-bamg/test/dotest.pl
index 3c307b0..115c0cb 100755
--- a/examples-bamg/test/dotest.pl
+++ b/examples-bamg/test/dotest.pl
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/bin/perl
# ----- clean ---
unlink <*.mesh>;
unlink <*.am_fmt>;
diff --git a/src/fflib/Makefile.am b/src/fflib/Makefile.am
index b34abb9..bada1ae 100644
--- a/src/fflib/Makefile.am
+++ b/src/fflib/Makefile.am
@@ -64,5 +64,5 @@ AM_CPPFLAGS=-I$(srcdir)/../lglib -I$(srcdir)/../bamglib -I$(srcdir)/../Graphics
EXTRA_DIST=strversionnumber.m4
BUILT_SOURCES=strversionnumber.cpp
strversionnumber.cpp: $(libff_a_SOURCES2) ../../configure
- m4 -DVersionFreeFemDate="`date`" strversionnumber.m4 > $@
+ m4 -DVersionFreeFemDate="@FF_DATE@" strversionnumber.m4 > $@
FORCE:
diff --git a/src/fflib/strversionnumber.cpp b/src/fflib/strversionnumber.cpp
index 3cd397e..20c52cb 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 Sun Apr 24 23:47:18 EEST 2016)",VersionNumber());
- return buffer; //.str()+" (date Sun Apr 24 23:47:18 EEST 2016)" ;
+ sprintf(buffer," %9f (date Mon Apr 25 00:36:11 EEST 2016)",VersionNumber());
+ return buffer; //.str()+" (date Mon Apr 25 00:36:11 EEST 2016)" ;
}
diff --git a/src/medit/Makefile.am b/src/medit/Makefile.am
index 039b8fd..98a2b00 100644
--- a/src/medit/Makefile.am
+++ b/src/medit/Makefile.am
@@ -17,7 +17,7 @@ LDADD=picking.$(OBJEXT) ../libMesh/libMesh.a $(LIBSGLUT) -lm
AM_CPPFLAGS=-I$(srcdir)/../libMesh
BUILT_SOURCES=compil.date
compil.date: $(ffmedit_SOURCES)
- echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
+ echo "#define COMPIL " '" @FF_DATE@ (with ff++ $(VERSION))"' > compil.date
#.PHONY: compil.date
# ALH - during a parallel make, we should make sure that picking.o is not used before being made by a different
--
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