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

The delegates.mgk file embeds the full path to the "mv" binary, which is
different on usrmerge systems:

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

  ./usr/lib/GraphicsMagick-1.4/config/delegates.mgk

  
<delegate·decode="hpg"·command='"hp2xx"·-q·-m·eps·-f·`basename·"%o"`·"%i"·&&·/bin/mv·-f·`basename·"%o"`·"%o"'·/>
  vs.
  
<delegate·decode="hpg"·command='"hp2xx"·-q·-m·eps·-f·`basename·"%o"`·"%i"·&&·/usr/bin/mv·-f·`basename·"%o"`·"%o"'·/>

The attached patch fixes this in debian/rules by passing arguments to
configure to use the paths in the non-usrmerge paths, as usrmerge
systems typically have compatibility symlinks, while non-usrmerge
systems do not.


This patch does not resolve all reproducibility issues, though the only
remaining issue is build paths, which is not tested in the "testing"
suite, so applying this patch should result in reproducible builds once
it migrates to "testing".


Thanks for maintaining graphicsmagick!


live well,
  vagrant
From d5054356232c666ba611742a55de9d6660740143 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Sun, 20 Jun 2021 01:39:52 +0000
Subject: [PATCH] debian/rules: Pass MVDelegate to configure.

The path to "mv" may end up in binaries or documentation, which may be
/bin/mv or /usr/bin/mv depending on if the running system is a
usrmerge system or not. Consistently use /bin/mv as this is the most
compatible path.

https://tests.reproducible-builds.org/debian/issues/paths_vary_due_to_usrmerge_issue.html
---
 debian/rules | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/rules b/debian/rules
index 46fcb72..4c48093 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,6 +52,7 @@ configure-stamp:
 	dh_testdir
 	dh_autoreconf
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+	MVDelegate=/bin/mv \
 	    ./configure $(gm_confflags) \
 		--enable-shared \
 		--enable-static \
-- 
2.32.0

Attachment: signature.asc
Description: PGP signature

Reply via email to