Bug#1021470: xsok: reproducible-builds: build path embedded in /usr/games/xsok
On 2024-05-02, Petter Reinholdtsen wrote: > [Vagrant Cascadian] >> Still appears to be an issue, though tests.reproducible-builds.org is no >> longer testing build path variations. Downgrading the severity >> accordingly. > > Hm, then I do not understand the fix. As far as I can tell, the default > build flags are used. Perhaps you can take a look at this orphaned > package in https://salsa.debian.org/debian/xsok > and commit a fix > that really solve the issue. There are two things; even if CFLAGS is actually available, the upstream build system uses CCOPTIONS instead. CFLAGS was not exported, maybe due to being classing debhelper rather than modern dh style? I took the liberty of converting the rules file to dh (although I struggled getting dh_auto_install to do the right thing and mostly left that alone)... which appears to do the right thing and allows replacing the manual calls to dpkg-buildflags with their corresponding variables... not to mention considerably less boilerplate! I did not do any significant testing, although debdiff showed no difference after the conversion. > I plan a new upload tomorrow to push the latest git changes into > unstable. Thanks! live well, vagrant signature.asc Description: PGP signature
Bug#1021470: xsok: reproducible-builds: build path embedded in /usr/games/xsok
[Vagrant Cascadian] > Still appears to be an issue, though tests.reproducible-builds.org is no > longer testing build path variations. Downgrading the severity > accordingly. Hm, then I do not understand the fix. As far as I can tell, the default build flags are used. Perhaps you can take a look at this orphaned package in https://salsa.debian.org/debian/xsok > and commit a fix that really solve the issue. I plan a new upload tomorrow to push the latest git changes into unstable. -- Happy hacking Petter Reinholdtsen
Bug#1021470: xsok: reproducible-builds: build path embedded in /usr/games/xsok
Control: found 1021470 1.02-20 Control: severity 1021470 minor On 2024-05-01, Debian Bug Tracking System wrote: > From: Petter Reinholdtsen > Subject: Accepted xsok 1.02-20 (source) into unstable ... > As far as I can tell, the latest changes to the package build system > made the build reproducible. I suspect it was the switching to level 13 > with default compiler flags. Still appears to be an issue, though tests.reproducible-builds.org is no longer testing build path variations. Downgrading the severity accordingly. It can be reproduced using reprotest manually, or possibly by enabling salsa-ci pipelines, or building twice with sbuild, which currently randomizes the build path by default. live well, vagrant signature.asc Description: PGP signature
Bug#1021470: xsok: reproducible-builds: build path embedded in /usr/games/xsok
Source: xsok Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: buildpath X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org The build path is embedded in /usr/games/xsok: https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/xsok.html /build/1st/xsok-1.02/src/Xaw-main.c:273 vs. /build/2/xsok-1.02/2nd/src/Xaw-main.c:273 The attached patch to debian/rules fixes this by passing to make the default CFLAGS using the upstream CCOPTIONS variable. According to my local tests, with this patch applied, xsok should build reproducibly on tests.reproducible-builds.org! Thanks for maintaining xsok! live well, vagrant From 61246f44398cd2537268920502a906aa99f8233c Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 9 Oct 2022 01:21:33 + Subject: [PATCH] debian/rules: Pass default CFLAGS via CCOPTIONS variable. --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 216e53d..fc9561e 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ build-indep: build build: build-stamp build-stamp: dh_testdir - $(MAKE) $(OPTIMIZE) \ + $(MAKE) CCOPTIONS="$(shell dpkg-buildflags --get CFLAGS)" $(OPTIMIZE) \ LOCAL_LIBRARIES='-lXpm -lXaw -lXt -lX11' \ XSOKLIBDIR=/usr/share/games/xsok \ XSOKSAVEDIR=/var/games/xsok -- 2.30.2 signature.asc Description: PGP signature
