[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1037277: advi: reproducible-builds: Embedded build path and usrmerge paths in example Makefile



Source: advi
Severity: normal
Tags: patch
User: reproducible-builds@lists.alioth.debian.org
Usertags: buildpath usrmerge
X-Debbugs-Cc: reproducible-bugs@lists.alioth.debian.org

The build path and various binary paths are embedded in
/usr/share/doc/advi/manual/pngs/Makefile.gz:

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

  ACLOCAL·=·${SHELL}·/build/1st/advi-1.10.2/missing·--run·aclocal-1.11
  vs.
  ACLOCAL·=·${SHELL}·/build/2/advi-1.10.2/2nd/missing·--run·aclocal-1.11

  EGREP·=·/bin/grep·-E	
  vs.
  EGREP·=·/usr/bin/grep·-E

The attached patch fixes this by removing the example Makefile, which
would have to be regenerated anyways to match the running system.

If removing the example Makefile is not viable, it might be possible to
sanitize the build paths, and add relevent arguments to configure
(e.g. EGREP='/bin/grep -e') to use the specified paths.

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

Thanks for maintaining advi!

live well,
  vagrant
From 74e3aa7add59ff6b73ff7aec20c6963244bc275d Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagrant@reproducible-builds.org>
Date: Fri, 9 Jun 2023 19:40:34 -0700
Subject: [PATCH] debian/rules: Remove example Makefile in dh_install override.

This Makefile embeds the build path and binary paths of the build
environment, and would need to be regenerated to actually use.

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

diff --git a/debian/rules b/debian/rules
index ca3a02c..2c8c922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,11 @@ endif
 override_dh_compress:
 	dh_compress --exclude=usr/share/doc/advi/splash.dvi
 
+override_dh_install:
+	dh_install
+	# Remove example Makefile with build paths and binary paths
+	rm -vf debian/advi/usr/share/doc/advi/manual/pngs/Makefile
+
 override_dh_auto_test:
 
 override_dh_autoreconf:
-- 
2.39.2

Attachment: signature.asc
Description: PGP signature


Reply to: