Skip to content

Commit 4f848cd

Browse files
mzf-guestmzf-guest
committed
Apply reproductibility patch from debian package.
1 parent def2599 commit 4f848cd

File tree

11 files changed

+16
-12
lines changed

11 files changed

+16
-12
lines changed

‎configure.ac

+4-2
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

@@ -679,7 +681,7 @@ ff_prefix_dir="${prefix}/lib/ff++/$VERSION"
679681
AC_MSG_CHECKING(prefix dir freefem++ )
680682
AC_MSG_RESULT($ff_prefix_dir)
681683

682-
FF_DATE=`date`
684+
FF_DATE="$BUILD_DATE"
683685
AC_DEFINE_UNQUOTED(VersionFreeFemDate,"$FF_DATE",FreeFEM build date)
684686
AC_DEFINE_UNQUOTED(FF_PREFIX_DIR,"${ff_prefix_dir}",FreeFem prefix dir)
685687
AC_SUBST(ff_prefix_dir,$ff_prefix_dir)

‎examples/3d/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ EXTRA_DIST = *.edp \
134134

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

‎examples/3dCurve/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ EXTRA_DIST = *.edp all.edp
5656

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

‎examples/3dSurf/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ EXTRA_DIST = *.edp all.edp
6565

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

‎examples/eigen/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ EXTRA_DIST = *.edp all.edp
5858

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

‎examples/examples/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ EXTRA_DIST = *.edp all.edp regtests.edp regtests.m4 ref.edp
6767

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

‎examples/misc/Makefile.am

+1-1
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ all.edp:
287287
mkdir o
288288
@test -f ../../src/bin-win32/FreeFem++.exe && ffpp=../../src/bin-win32/FreeFem++.exe || ffpp=../../src/nw/FreeFem++; \
289289
(echo "NoGraphicWindow=true;NoUseOfWait=true;int verbosityy=verbosity;"; \
290-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
290+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
291291
if $$ffpp -ns -jc -v 0 $$i 1>/dev/null 2>/dev/null ; then \
292292
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
293293
echo "verbosity=verbosityy;" ; \

‎examples/tutorial/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ EXTRA_DIST=*.edp aile.msh xyf all.edp regtests.edp regtests.m4 ref.edp
3939

4040
all.edp:
4141
(echo "NoUseOfWait=true;int verbosityy=verbosity;"; \
42-
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$'` ; do \
42+
for i in *`ls *.edp|grep -v -E '^(all|regtests|makeref|ref)\.edp$$' | LC_ALL=C sort` ; do \
4343
echo ' cout << "--------- file : '$$i' --------------------------------------------------------" << endl;' ;\
4444
echo "verbosity=verbosityy;" ; \
4545
echo \{ include \"$$i\"\;\}\; ;\

‎src/fflib/Makefile.am

+2-1
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

+2-1
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)