[scummvm] 01/01: Build reproducibly (Closes: #827145). Thanks, Reiner Herrmann.

[Dmitry Smirnov]

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

onlyjob pushed a commit to branch master
in repository scummvm.

commit 4482dcd (HEAD, master)
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Fri Nov 11 12:58:05 2016

    Build reproducibly (Closes: #827145). Thanks, Reiner Herrmann.
---
 debian/changelog |  2 ++
 debian/rules     | 14 ++++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e4e548d..408f389 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ scummvm (1.9.0+dfsg-1) unstable; urgency=medium
   * New upstream release [October 2016].
   * Removed obsolete "libsdl2.patch".
   * Removed traces of -dbg package.
+  * Build reproducibly (Closes: #827145)
+    Thanks, Reiner Herrmann.
 
  -- Dmitry Smirnov <onlyjob at debian.org>  Fri, 11 Nov 2016 23:17:07 +1100
 
diff --git a/debian/rules b/debian/rules
index b23ec6d..4b91a47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,15 @@
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
+# #827145:
+# When building for i386 on an amd64 system/kernel, the host
+# architecture is misdetected as x86_64, which causes USE_NASM to be
+# unset and prevents the object files hq2x_i386.o and hq3x_i386.o from
+# being built.
+# This is fixed by passing the host architecture explicitely to
+# configure.
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
 %:
 	dh $@ --parallel --max-parallel=4 --with autotools_dev
 
@@ -22,6 +31,7 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	./configure \
+            --host=$(DEB_HOST_GNU_TYPE) \
             --datadir=/usr/share/scummvm \
             --disable-eventrecorder \
             --enable-release \
@@ -33,9 +43,9 @@ override_dh_auto_build:
 	## replacing bundled fonts...
 	for F in $(FPATH)/Free*.ttf; do cp -v /usr/share/fonts/truetype/freefont/$$(basename $${F}) $(FPATH)/ ;done
 	## re-compressing "modern" theme...
-	cd $(FPATH) && zip -9 ../scummmodern.zip -r .
+	cd $(FPATH) && zip -9 -X ../scummmodern.zip -r .
 	## re-compressing "classic" theme...
-	cd gui/themes/scummclassic && zip -9 ../scummclassic.zip -r .
+	cd gui/themes/scummclassic && zip -9 -X ../scummclassic.zip -r .
 	## build executable(s)...
 	dh_auto_build
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/scummvm.git