Source: scummvm Version: 1.8.1+dfsg-1 Severity: wishlist Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: username environment X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org
Hi! While working on the "reproducible builds" effort [1], we have noticed that scummvm could not be built reproducibly. There are two issues: - When the theme zip archives are created, they contain uid/gid from the build user in zip extra fields. This is fixed by passing -X to zip. As fas as i can tell, this metadata is not used by scummvm. - 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. Regards, Reiner [1]: https://wiki.debian.org/ReproducibleBuilds
diff --git a/debian/rules b/debian/rules
index fca1a20..061fcd3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@
export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
%:
dh $@ --parallel --max-parallel=4 --with autotools_dev
@@ -22,6 +24,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 +36,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
signature.asc
Description: PGP signature
