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

The path to sed is embedded in various binaries, which differs on a
usrmerge vs. non-usrmerge system.

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

  ./usr/lib/gcc/i686-w64-mingw32/10-posix/install-tools/fixincl

  /bin/sed
  vs.
  /usr/bin/sed

Patch attached which passes the SED variable to configure to use the
non-usrmerge location, as usrmerge installations typically have
compatibility symlinks, but not vice-versa.


This should make gcc-mingw-w64 reproducible in the testing suite on
tests.reproducible-builds.org, but does not resolve all tested
variations (e.g. build paths) in the unstable and experimental suites.


live well,
  vagrant
From 1186fd00803ff053eb5dac817bd72e994ba0f506 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Tue, 13 Jul 2021 05:48:59 +0000
Subject: [PATCH] debian/rules: Pass explicit path for sed.

Use the non-usrmerge path for sed binary, which works on both usrmerge
and non-usrmerge systems.

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

diff --git a/debian/rules b/debian/rules
index b71f935..ba60795 100755
--- a/debian/rules
+++ b/debian/rules
@@ -256,6 +256,10 @@ CONFFLAGS += \
 CONFFLAGS += \
 	--enable-dependency-tracking
 
+# Use the most compatible path for sed (e.g. non-usrmerge).
+CONFFLAGS += \
+	SED=/bin/sed
+
 spelling = grep -rl "$(1)" $(upstream_dir) | xargs -r sed -i "s/$(1)/$(2)/g"
 
 # Patches applied or unapplied after the upstream sources have been
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature

Reply via email to