Source: rpm Severity: normal Tags: patch User: reproducible-bui...@lists.alioth.debian.org Usertags: usrmerge 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/bullseye/amd64/diffoscope-results/rpm.html ./usr/lib/rpm/macros %__bzip2» » /bin/bzip2 vs. %__bzip2» » /usr/bin/bzip2 Patch attached which passes variables to configure to use the non-usrmerge locations, as usrmerge installations typically have compatibility symlinks, but not vice-versa. live well, vagrant
From edef98ba189c9eee0682813db839b33a5ffd4e85 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian <vagr...@reproducible-builds.org> Date: Fri, 25 Jun 2021 20:24:46 +0000 Subject: [PATCH] debian/rules: Pass paths to various binaries. Use the non-usrmerge locations for binaries, 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 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 3e05ba54..0cc1be30 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,22 @@ configure_flags += \ --enable-shared \ --enable-python \ LDFLAGS="$(LDFLAGS) -Wl,--as-needed" \ - CPPFLAGS="$(CPPFLAGS)" + CPPFLAGS="$(CPPFLAGS)" \ + __BZIP2=/bin/bzip2 \ + __CAT=/bin/cat \ + __CHGRP=/bin/chgrp \ + __CHMOD=/bin/chmod \ + __CHOWN=/bin/chown \ + __CP=/bin/cp \ + __GREP=/bin/grep \ + __GZIP=/bin/gzip \ + __LZIP=/bin/lzip \ + __MKDIR=/bin/mkdir \ + __MV=/bin/mv \ + __RM=/bin/rm \ + __SED=/bin/sed \ + __TAR=/bin/tar \ + MKDIR_P='/bin/mkdir -p' \ override_dh_auto_configure: dh_auto_configure -- $(configure_flags) -- 2.32.0
signature.asc
Description: PGP signature
