[Debian-astro-commits] [funtools] 01/02: [Alexis Bienvenüe] Sort object files to pass to mklib, to make the build reproducible.

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch debian
in repository funtools.

commit 4de12c91b564c9026b462ee107a6170b6e3747a6
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Jun 23 08:43:27 2016 +0200

    [Alexis Bienvenüe] Sort object files to pass to mklib, to make the build reproducible.
---
 debian/changelog                       |  5 +++++
 debian/patches/series                  |  1 +
 debian/patches/sort-object-files.patch | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 39 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 433734d..bdb65e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 funtools (1.4.6+git150811-3) UNRELEASED; urgency=low
 
+  [ Ole Streicher ]
   * Update standards-version to 3.9.7 (no changes)
   * Update VCS fields, add ASCL-Id
 
+  [ Alexis Bienvenüe ]
+  * Sort object files to pass to mklib, to make the build reproducible.
+    Closes: #827864
+
  -- Ole Streicher <olebole at debian.org>  Fri, 26 Feb 2016 15:55:16 +0100
 
 funtools (1.4.6+git150811-2) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index ef62806..f95202b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ link_to_so.patch
 use_shared_libwcstools.patch
 build_tclfun.patch
 multiarch.patch
+sort-object-files.patch
diff --git a/debian/patches/sort-object-files.patch b/debian/patches/sort-object-files.patch
new file mode 100644
index 0000000..8e5b626
--- /dev/null
+++ b/debian/patches/sort-object-files.patch
@@ -0,0 +1,33 @@
+Description: Sort object files
+ Sort object files to pass to mklib, to make the build reproducible.
+Author: Alexis Bienvenüe <pado at passoire.fr>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -233,7 +233,7 @@
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../$(LIB)); \
+ 		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -o $(PACKAGE) -ldl $(WCS_LIBS) -lm -lz $(PACKAGE)tmp/*.o; \
++		./mklib -o $(PACKAGE) -ldl $(WCS_LIBS) -lm -lz `LC_ALL=C ls $(PACKAGE)tmp/*.o`; \
+ 		rm -rf $(PACKAGE)tmp;)
+ 
+ mainlib:	$(MAINLIBOBJS) funmainlib.o lex.calc.o
+@@ -245,7 +245,7 @@
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../lib$(PACKAGE)MainLib.a); \
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -o $(PACKAGE)MainLib -L. -lfuntools $(PACKAGE)tmp/*.o;\
++		./mklib -o $(PACKAGE)MainLib -L. -lfuntools `LC_ALL=C ls $(PACKAGE)tmp/*.o`;\
+ 		rm -rf $(PACKAGE)tmp;)
+ 
+ tclfun:		$(LIB) tclmainlib.o tclfun.o
+@@ -256,7 +256,7 @@
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../libtclfun.a); \
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -o tclfun -L. -lfuntools $(PACKAGE)tmp/*.o $(TCL_LIBS); \
++		./mklib -o tclfun -L. -lfuntools `LC_ALL=C ls $(PACKAGE)tmp/*.o` $(TCL_LIBS); \
+ 		rm -rf $(PACKAGE)tmp; \
+ 		test -r pkgIndex.tcl && mv pkgIndex.tcl pkgIndex.tcl-old; \
+ 		SHLIB=libtclfun.so; \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/funtools.git