Source: afterstep
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: buildpath usrmerge
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

The build path and various binary paths are embedded in
/usr/share/doc/libafterimage-dev/examples/Makefile:

  
https://tests.reproducible-builds.org/debian/rb-pkg/unstable/amd64/diffoscope-results/afterstep.html

  
CCFLAGS·········=·-O3·-g·-ffile-prefix-map=/build/1st/afterstep-2.2.12=.·-fstack-protector-strong
 ...
  vs.
  
CCFLAGS·········=·-O3·-g·-ffile-prefix-map=/build/2/afterstep-2.2.12/2nd=.·-fstack-protector-strong
 ...

  CP»     »     =·/bin/cp
  vs.
  CP»     »     =·/usr/bin/cp

The attached patch fixes this by adjusting these values from the
debian/rules dh_compress override.

According to my local tests, with this patch applied afterstep should build
reproducibly on tests.reproducible-builds.org!

Thanks for maintaining afterstep!

live well,
  vagrant
From dadf1113a310962fcbd1f934379ae5b634f67dae Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Fri, 9 Jun 2023 20:16:52 -0700
Subject: [PATCH] debian/rules: Adjust build path and binary paths in example
 Makefile.

The embedded build path and binary paths would require regenerating
the Makefile to match the system they are run on.

https://reproducible-builds.org/docs/build-path/
https://tests.reproducible-builds.org/debian/issues/unstable/paths_vary_due_to_usrmerge_issue.html
---
 debian/rules | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/rules b/debian/rules
index f319152..0965416 100755
--- a/debian/rules
+++ b/debian/rules
@@ -245,6 +245,13 @@ override_dh_compress:
 	sh debian/scripts/fix_conffiles `dh_listpackages`
 	# the menu method is installed into ucf dir by fix_conffiles above
 	rm -f debian/afterstep/etc/menu-methods/afterstep
+	# Normalize build path and various binary paths
+	sed -i -e "s,$(CURDIR),BUILDPATH,g" \
+	       -e "s,/usr/bin/cp,/bin/cp,g" \
+	       -e "s,/usr/bin/mv,/bin/mv,g" \
+	       -e "s,/usr/bin/rm,/bin/rm,g" \
+	       -e "s,/usr/bin/mkdir,/bin/mkdir,g" \
+	          debian/libafterimage-dev/usr/share/doc/libafterimage-dev/examples/Makefile
 	dh_compress
 
 override_dh_md5sums:
-- 
2.39.2

Attachment: signature.asc
Description: PGP signature

Reply via email to