From 4f848cd2cc23a67582a172e54cf632a84b490267 Mon Sep 17 00:00:00 2001 From: Francois Mazen Date: Wed, 28 Jul 2021 19:06:10 +0200 Subject: [PATCH 1/3] Apply reproductibility patch from debian package. --- configure.ac | 6 ++++-- examples/3d/Makefile.am | 2 +- examples/3dCurve/Makefile.am | 2 +- examples/3dSurf/Makefile.am | 2 +- examples/eigen/Makefile.am | 2 +- examples/examples/Makefile.am | 2 +- examples/misc/Makefile.am | 2 +- examples/plugin/Makefile.am | 2 +- examples/tutorial/Makefile.am | 2 +- src/fflib/Makefile.am | 3 ++- src/medit/Makefile.am | 3 ++- 11 files changed, 16 insertions(+), 12 deletions(-) diff --git a/configure.ac b/configure.ac index bfa05e1bd..b8628019c 100644 --- a/configure.ac +++ b/configure.ac @@ -185,7 +185,9 @@ m4_define([TOOL_DISABLE_NO], TOOL_PARAMETERS($1,$2,$3) ]) -echo "# Build with FreeFEM with ./configure " `date` >$ff_where_lib_conf +BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" + +echo "# Build with FreeFEM with ./configure $BUILD_DATE" >$ff_where_lib_conf # To allow anonymous CVS version to contain a "./configure" and # Makefiles @@ -679,7 +681,7 @@ ff_prefix_dir="${prefix}/lib/ff++/$VERSION" AC_MSG_CHECKING(prefix dir freefem++ ) AC_MSG_RESULT($ff_prefix_dir) -FF_DATE=`date` +FF_DATE="$BUILD_DATE" AC_DEFINE_UNQUOTED(VersionFreeFemDate,"$FF_DATE",FreeFEM build date) AC_DEFINE_UNQUOTED(FF_PREFIX_DIR,"${ff_prefix_dir}",FreeFem prefix dir) AC_SUBST(ff_prefix_dir,$ff_prefix_dir) diff --git a/examples/3d/Makefile.am b/examples/3d/Makefile.am index 67055d85e..cfe4ddc39 100644 --- a/examples/3d/Makefile.am +++ b/examples/3d/Makefile.am @@ -134,7 +134,7 @@ EXTRA_DIST = *.edp \ 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;searchMethod=0;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/examples/3dCurve/Makefile.am b/examples/3dCurve/Makefile.am index b7a23c2aa..379b25ad6 100644 --- a/examples/3dCurve/Makefile.am +++ b/examples/3dCurve/Makefile.am @@ -56,7 +56,7 @@ EXTRA_DIST = *.edp all.edp 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;searchMethod=0;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/examples/3dSurf/Makefile.am b/examples/3dSurf/Makefile.am index 83e88e70c..a7e9f7bac 100644 --- a/examples/3dSurf/Makefile.am +++ b/examples/3dSurf/Makefile.am @@ -65,7 +65,7 @@ EXTRA_DIST = *.edp all.edp 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;searchMethod=0;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/examples/eigen/Makefile.am b/examples/eigen/Makefile.am index 6e909aa33..aa467d191 100644 --- a/examples/eigen/Makefile.am +++ b/examples/eigen/Makefile.am @@ -58,7 +58,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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/examples/examples/Makefile.am b/examples/examples/Makefile.am index fa95cf863..3e63f21b8 100644 --- a/examples/examples/Makefile.am +++ b/examples/examples/Makefile.am @@ -67,7 +67,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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/examples/misc/Makefile.am b/examples/misc/Makefile.am index 2534002d5..30fce7b2e 100644 --- a/examples/misc/Makefile.am +++ b/examples/misc/Makefile.am @@ -47,7 +47,7 @@ EXTRA_DIST=*.edp all.edp regtests.edp regtests.m4 ref.edp torture.msh speedtest. 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/examples/plugin/Makefile.am b/examples/plugin/Makefile.am index 64d62833d..6c2e22a76 100644 --- a/examples/plugin/Makefile.am +++ b/examples/plugin/Makefile.am @@ -287,7 +287,7 @@ all.edp: mkdir o @test -f ../../src/bin-win32/FreeFem++.exe && ffpp=../../src/bin-win32/FreeFem++.exe || ffpp=../../src/nw/FreeFem++; \ (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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ if $$ffpp -ns -jc -v 0 $$i 1>/dev/null 2>/dev/null ; then \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;" ; \ diff --git a/examples/tutorial/Makefile.am b/examples/tutorial/Makefile.am index a3d7f9896..418c19e4a 100644 --- a/examples/tutorial/Makefile.am +++ b/examples/tutorial/Makefile.am @@ -39,7 +39,7 @@ EXTRA_DIST=*.edp 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 *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \ echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\ echo "verbosity=verbosityy;" ; \ echo \{ include \"$$i\"\;\}\; ;\ diff --git a/src/fflib/Makefile.am b/src/fflib/Makefile.am index ccdf8cd5c..2aaec2bf4 100644 --- a/src/fflib/Makefile.am +++ b/src/fflib/Makefile.am @@ -105,6 +105,7 @@ endif # Build date changes at every change EXTRA_DIST=strversionnumber.m4 BUILT_SOURCES=strversionnumber.cpp +BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" strversionnumber.cpp: $(libff_a_SOURCES2) ../../Makefile - m4 -DVersionFreeFemDate="`date`" -DGitVersion="`git describe --tags 2>/dev/null|| echo 'no git'`" strversionnumber.m4 > $@ + m4 -DVersionFreeFemDate="$(BUILD_DATE)" -DGitVersion="`git describe --tags 2>/dev/null|| echo 'no git'`" strversionnumber.m4 > $@ FORCE: diff --git a/src/medit/Makefile.am b/src/medit/Makefile.am index a9fbda326..7f0503d65 100644 --- a/src/medit/Makefile.am +++ b/src/medit/Makefile.am @@ -16,8 +16,9 @@ ffmedit_SOURCES=animat.c cube.c image.c listnum.c mouse.c persp.c stream.c zaldy LDADD=picking.$(OBJEXT) ../libMesh/libMesh.a $(LIBSGLUT) -lm AM_CPPFLAGS=-I$(srcdir)/../libMesh BUILT_SOURCES=compil.date +BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" compil.date: $(ffmedit_SOURCES) - echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date + echo "#define COMPIL " '"' $(BUILD_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 From 85700f1edc1426911e9a164ea48df4f2bb998985 Mon Sep 17 00:00:00 2001 From: Pierre Jolivet Date: Mon, 10 Apr 2023 19:11:48 +0200 Subject: [PATCH 2/3] Update configure.ac --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b8628019c..228020f73 100644 --- a/configure.ac +++ b/configure.ac @@ -185,7 +185,9 @@ m4_define([TOOL_DISABLE_NO], TOOL_PARAMETERS($1,$2,$3) ]) -BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)" +DATE_FMT="+%Y-%m-%d" +SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" +BUILD_DATE=$(date -u -d "@$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u "$DATE_FMT")``` echo "# Build with FreeFEM with ./configure $BUILD_DATE" >$ff_where_lib_conf # To allow anonymous CVS version to contain a "./configure" and From 934aff7e974bea5c0ce1a0bdd96cb660774539b1 Mon Sep 17 00:00:00 2001 From: Pierre Jolivet Date: Mon, 10 Apr 2023 20:05:22 +0200 Subject: [PATCH 3/3] Update configure.ac --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 228020f73..928593d16 100644 --- a/configure.ac +++ b/configure.ac @@ -187,7 +187,7 @@ m4_define([TOOL_DISABLE_NO], DATE_FMT="+%Y-%m-%d" SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}" -BUILD_DATE=$(date -u -d "@$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u "$DATE_FMT")``` +BUILD_DATE=$(date -u -d "@$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "$DATE_FMT" 2>/dev/null || date -u "$DATE_FMT") echo "# Build with FreeFEM with ./configure $BUILD_DATE" >$ff_where_lib_conf # To allow anonymous CVS version to contain a "./configure" and