Package: dpkg
Version: 1.20.5
Severity: normal
Tags: patch
User: reproducible-bui...@lists.alioth.debian.org
Usertags: fixfilepath toolchain
X-Debbugs-Cc: reproducible-b...@lists.alioth.debian.org

The discussion to enable the fixfilepath feature raised no issues on
debian-devel:

  https://lists.debian.org/debian-devel/2020/10/msg00222.html

An archive-wide rebuild has been performed and patches have been filed
for most affected packages (the few remaining ones will be fixed with
the expected upgrade of llvm-defaults in bullseye).


Even though fixdebugpath is superceded by fixfilepath, the patch leaves
fixdebugpath enabled by default so fixdebugpath would still be enabled
if someone worked around issues with fixfilepath with debian/rules:

  DEB_BUILD_MAINT_OPTIONS=reproducible=-fixfilepath


Thanks for all your work on dpkg; I use it... nearly every single
day. :)


live well,
  vagrant
From 661a6134928df5c1cc9819b6d3ee0cfcb1fc83d4 Mon Sep 17 00:00:00 2001
From: Vagrant Cascadian <vagr...@reproducible-builds.org>
Date: Mon, 9 Nov 2020 11:40:05 -0800
Subject: [PATCH] dpkg-buildflags: Enable reproducible=fixfilepath by default.

https://lists.debian.org/debian-devel/2020/10/msg00222.html
---
 man/dpkg-buildflags.pod       | 2 +-
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/man/dpkg-buildflags.pod b/man/dpkg-buildflags.pod
index dac1be7ad..e48bea698 100644
--- a/man/dpkg-buildflags.pod
+++ b/man/dpkg-buildflags.pod
@@ -573,7 +573,7 @@ B<__TIMESTAMP__> macros are used.
 
 =item B<fixfilepath>
 
-This setting (disabled by default) adds
+This setting (enabled by default) adds
 B<-ffile-prefix-map=>I<BUILDPATH>B<=.>
 to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>,
 B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 23237a906..d4b46c19e 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -105,7 +105,7 @@ sub _add_build_flags {
         },
         reproducible => {
             timeless => 1,
-            fixfilepath => 0,
+            fixfilepath => 1,
             fixdebugpath => 1,
         },
         sanitize => {
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature

Reply via email to