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

The paths to various binaries are embedded which differs on a usrmerge
vs. non-usrmerge system.

  
https://tests.reproducible-builds.org/debian/rb-pkg/bookworm/amd64/diffoscope-results/gcc-xtensa-lx106.html

  ./usr/lib/gcc/xtensa-lx106-elf/10.3.1/install-tools/fixincl
        
  /bin/sed      
vs.
  /usr/bin/sed

  ./usr/lib/gcc/xtensa-lx106-elf/10.3.1/install-tools/mkheaders

  for·shell·in·$CONFIG_SHELL·$SHELL·/bin/bash·/bin/sh·"";·do
vs.
  for·shell·in·$CONFIG_SHELL·$SHELL·/bin/sh·/bin/sh·"";·do


Patch attached which passes variables to configure to use the
non-usrmerge locations, as usrmerge installations typically have
compatibility symlinks, but not vice-versa. The patch also sets
variables to ensure consistent values for bash, which can be triggered
when /bin/sh points to bash.


This patch alone does not fix all reproducibility issues (e.g. build
paths, which are only tested on unstable and experimental), but it
should build reproducibly in bookworm/testing once binutils-xtensa-lx106
is built with deterministic archives enabled:

  https://bugs.debian.org/1003494


Thanks for maintaining gcc-xtensa-lx106!


live well,
  vagrant
From cf21d21676939698399a9f8ee6b0048f9dbefc5b Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Tue, 11 Jan 2022 02:53:34 +0000
Subject: [PATCH] debian/rules: Pass variables to configure to make the package
 build reproducibly regardless of usrmerge.

The variables SED, SHELL, BASH and CONFIG_SHELL should all point to
their non-usrmerge locations.

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 eb94981..c9fae9a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,10 @@ configure_flags = \
 	--without-newlib \
 	"--with-pkgversion=$(deb_version)" \
 	--without-included-gettext \
+	SED=/bin/sed \
+	SHELL=/bin/sh \
+	BASH=/bin/bash \
+	CONFIG_SHELL=/bin/bash \
 	$(buildflags) \
 	$(target_tools)
 
-- 
2.30.2

Attachment: signature.asc
Description: PGP signature

Reply via email to