Skip to content

Commit bb17cca

Browse files
mzf-guestmzf-guest
committed
Apply reproductibility patch from debian package.
1 parent 7cd3bd6 commit bb17cca

File tree

11 files changed

+17
-13
lines changed

11 files changed

+17
-13
lines changed

‎configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ m4_define([TOOL_DISABLE_NO],
185185
TOOL_PARAMETERS($1,$2,$3)
186186
])
187187

188-
echo "# Build with FreeFEM with ./configure " `date` >$ff_where_lib_conf
188+
BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
189+
190+
echo "# Build with FreeFEM with ./configure $BUILD_DATE" >$ff_where_lib_conf
189191
# To allow anonymous CVS version to contain a "./configure" and
190192
# Makefiles
191193

@@ -667,7 +669,7 @@ ff_prefix_dir="${prefix}/lib/ff++/$VERSION"
667669
AC_MSG_CHECKING(prefix dir freefem++ )
668670
AC_MSG_RESULT($ff_prefix_dir)
669671

670-
FF_DATE=`date`
672+
FF_DATE="$BUILD_DATE"
671673
AC_DEFINE_UNQUOTED(VersionFreeFemDate,"$FF_DATE",FreeFEM build date)
672674
AC_DEFINE_UNQUOTED(FF_PREFIX_DIR,"${ff_prefix_dir}",FreeFem prefix dir)
673675
AC_SUBST(ff_prefix_dir,$ff_prefix_dir)

‎examples/3d/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ EXTRA_DIST = *.edp \
132132

133133
all.edp: Makefile
134134
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();"; \
135-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
135+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
136136
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
137137
echo "verbosity=verbosityy;searchMethod=0;" ; \
138138
echo \{ include \"$$i\"\;\}\; ;\

‎examples/3dCurve/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ EXTRA_DIST = *.edp all.edp
5555

5656
all.edp: Makefile
5757
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();"; \
58-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
58+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
5959
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
6060
echo "verbosity=verbosityy;searchMethod=0;" ; \
6161
echo \{ include \"$$i\"\;\}\; ;\

‎examples/3dSurf/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ EXTRA_DIST = *.edp all.edp
6464

6565
all.edp: Makefile
6666
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;int MEM1234=storageused();"; \
67-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
67+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
6868
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
6969
echo "verbosity=verbosityy;searchMethod=0;" ; \
7070
echo \{ include \"$$i\"\;\}\; ;\

‎examples/eigen/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ EXTRA_DIST = *.edp all.edp
5757

5858
all.edp:
5959
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
60-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
60+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
6161
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
6262
echo "verbosity=verbosityy;" ; \
6363
echo \{ include \"$$i\"\;\}\; ;\
@@ -66,4 +66,4 @@ all.edp:
6666

6767
freefem++.pref:Makefile
6868
echo includepath = \"../../idp/\" > freefem++.pref
69-
echo loadpath = \"../../plugin/seq/\" >> freefem++.pref
69+
echo loadpath = \"../../plugin/seq/\" >> freefem++.pref

‎examples/examples/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ EXTRA_DIST = *.edp all.edp regtests.edp regtests.m4 ref.edp
6666

6767
all.edp:
6868
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
69-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
69+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
7070
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
7171
echo "verbosity=verbosityy;" ; \
7272
echo \{ include \"$$i\"\;\}\; ;\

‎examples/misc/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ EXTRA_DIST=*.edp all.edp regtests.edp regtests.m4 ref.edp torture.msh speedtest.
4747

4848
all.edp:
4949
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
50-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
50+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
5151
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
5252
echo "verbosity=verbosityy;" ; \
5353
echo \{ include \"$$i\"\;\}\; ;\

‎examples/plugin/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ all.edp:
280280
mkdir o
281281
@test -f ../../src/bin-win32/FreeFem++.exe && ffpp=../../src/bin-win32/FreeFem++.exe || ffpp=../../src/nw/FreeFem++; \
282282
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
283-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
283+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
284284
if $$ffpp -ns -jc -v 0 $$i 1>/dev/null 2>/dev/null ; then \
285285
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
286286
echo "verbosity=verbosityy;" ; \

‎examples/tutorial/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ EXTRA_DIST=*.edp aile.msh xyf all.edp regtests.edp regtests.m4 ref.edp
3232

3333
all.edp:
3434
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
35-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
35+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
3636
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
3737
echo "verbosity=verbosityy;" ; \
3838
echo \{ include \"$$i\"\;\}\; ;\

‎src/fflib/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ endif
105105
# Build date changes at every change
106106
EXTRA_DIST=strversionnumber.m4
107107
BUILT_SOURCES=strversionnumber.cpp
108+
BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
108109
strversionnumber.cpp: $(libff_a_SOURCES2) ../../Makefile
109-
m4 -DVersionFreeFemDate="`date`" -DGitVersion="`git describe --tags 2>/dev/null|| echo 'no git'`" strversionnumber.m4 > $@
110+
m4 -DVersionFreeFemDate="$(BUILD_DATE)" -DGitVersion="`git describe --tags 2>/dev/null|| echo 'no git'`" strversionnumber.m4 > $@
110111
FORCE:

‎src/medit/Makefile.am

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@ ffmedit_SOURCES=animat.c cube.c image.c listnum.c mouse.c persp.c stream.c zaldy
1616
LDADD=picking.$(OBJEXT) ../libMesh/libMesh.a $(LIBSGLUT) -lm
1717
AM_CPPFLAGS=-I$(srcdir)/../libMesh
1818
BUILT_SOURCES=compil.date
19+
BUILD_DATE="$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y-%m-%d)"
1920
compil.date: $(ffmedit_SOURCES)
20-
echo "#define COMPIL " '"' `date` '(with ff++ $(VERSION))''"' > compil.date
21+
echo "#define COMPIL " '"' $(BUILD_DATE) '(with ff++ $(VERSION))''"' > compil.date
2122
#.PHONY: compil.date
2223

2324
# ALH - during a parallel make, we should make sure that picking.o is not used before being made by a different

0 commit comments

Comments
 (0)