[med-svn] [ray] 01/02: Fix linking order for reproducibility.

[Sascha Steinbiss]

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

sascha-guest pushed a commit to branch master
in repository ray.

commit b1ea1e8391b499e871403b1a17f0ac4ffcf3fdab
Author: Sascha Steinbiss <sascha at steinbiss.name>
Date:   Wed May 18 21:45:23 2016 +0000

    Fix linking order for reproducibility.
---
 debian/changelog                       |  7 +++++++
 debian/patches/series                  |  1 +
 debian/patches/stable-link-order.patch | 14 ++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7698985..1dee9f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ray (2.3.1-4) unstable; urgency=medium
+
+  * Team upload.
+  * Enforce stable sort order for linking to make build reproducible.
+
+ -- Sascha Steinbiss <sascha at steinbiss.name>  Wed, 18 May 2016 21:06:31 +0000
+
 ray (2.3.1-3) unstable; urgency=medium
 
   [ Sascha Steinbiss ]
diff --git a/debian/patches/series b/debian/patches/series
index 40c3d14..c6e858a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 hardening.patch
 mips.patch
 gcc-6.patch
+stable-link-order.patch
diff --git a/debian/patches/stable-link-order.patch b/debian/patches/stable-link-order.patch
new file mode 100644
index 0000000..9d8bedd
--- /dev/null
+++ b/debian/patches/stable-link-order.patch
@@ -0,0 +1,14 @@
+Description: use stable sort order for linking
+ This makes the build reproducible.
+Author: Sascha Steinbiss <sascha at steinbiss.name>
+--- a/Makefile
++++ b/Makefile
+@@ -159,7 +159,7 @@
+ 	$(Q)$(ECHO) "  CXX $@"
+ 	$(Q)$(MPICXX) $(CPPFLAGS) $(CXXFLAGS) $(CONFIG_FLAGS) -I. -IRayPlatform -c $< -o $@
+ 
+-include code/*/Makefile
++include $(sort $(wildcard code/*/Makefile))
+ 
+ showOptions:
+ 	$(Q)echo ""

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ray.git