[Debian-astro-commits] [xpa] 01/01: Build libs with fixed order *.o files, to ger reproducible build

[Ole Streicher]

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

olebole pushed a commit to branch debian
in repository xpa.

commit 8b3c303fb13645655f56dbc64ffaa2fdc41c12d8
Author: Ole Streicher <olebole at debian.org>
Date:   Tue Apr 26 09:35:53 2016 +0200

    Build libs with fixed order *.o files, to ger reproducible build
---
 debian/changelog            |  7 +++++++
 debian/patches/series       |  1 +
 debian/patches/sort_o_files | 24 ++++++++++++++++++++++++
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e1a454f..dcb83e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xpa (2.1.17-2) UNRELEASED; urgency=low
+
+  [ Alexis Bienvenüe ]
+  * Build libs with fixed order *.o files, to ger reproducible build.
+
+ -- Ole Streicher <olebole at debian.org>  Tue, 26 Apr 2016 09:34:36 +0200
+
 xpa (2.1.17-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/patches/series b/debian/patches/series
index 32b16bc..ea89961 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_paths.patch
 fix_manpages.patch
 install_tclxpa.patch
 hardening.patch
+sort_o_files
diff --git a/debian/patches/sort_o_files b/debian/patches/sort_o_files
new file mode 100644
index 0000000..59af457
--- /dev/null
+++ b/debian/patches/sort_o_files
@@ -0,0 +1,24 @@
+Description: Sort *.o files
+ Build libs with fixed order *.o files, to ger reproducible build.
+Author: Alexis Bienvenüe <pado at passoire.fr>
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -185,7 +185,7 @@
+ 		rm -f lib$(PACKAGE).tmp/xt*.o; \
+ 		rm -f lib$(PACKAGE).tmp/tcl*.o; \
+ 		CC='$(CC)' CXX=$(CXX) \
+-		./mklib -ldflags "$(LDFLAGS)" -o $(PACKAGE) lib$(PACKAGE).tmp/*.o; \
++		./mklib -ldflags "$(LDFLAGS)" -o $(PACKAGE) `LC_ALL=C ls lib$(PACKAGE).tmp/*.o`; \
+ 		rm -rf lib$(PACKAGE).tmp)
+ 
+ mingw-dll:	$(LIBOBJS)
+@@ -204,7 +204,7 @@
+ 		@(rm -rf $(PACKAGE)tmp; mkdir $(PACKAGE)tmp; \
+ 		(cd $(PACKAGE)tmp && ar x ../libtclxpa.a); \
+ 		CC='$(CC)' CXX='$(CXX)' \
+-		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa $(PACKAGE)tmp/*.o $(TCL_LIBS); \
++		./mklib -ldflags "$(LDFLAGS)" -o tclxpa -L. -lxpa `LC_ALL=C ls $(PACKAGE)tmp/*.o` $(TCL_LIBS); \
+ 		rm -rf $(PACKAGE)tmp; )
+ 
+ diff:

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