[dpkg] 01/01: Only disable fixdebugpath on amd64

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit b861250e7ba63ad7263c22fcbb11073ce698e499
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Apr 11 16:57:49 2017 +0200

    Only disable fixdebugpath on amd64
---
 debian/changelog              | 2 +-
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 886a4cb..ffbfc84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ dpkg (1.18.23.0~reproducible2) unstable; urgency=medium
   * dpkg-buildpackage: Append ${pkg}_${ver} to the BUILD_PATH_PREFIX_MAP envvar
     as described by https://reproducible-builds.org/specs/build-path-prefix-map/
   * dpkg-buildflags: Don't set -fdebug-prefix-map by default, and explain why
-    in the documentation.
+    in the documentation. CURRENTLY ONLY ON amd64 FOR tests.r-b.org.
   * dpkg-genbuildinfo: Also whitelist the BUILD_PATH_PREFIX_MAP envvar when
     build-paths are requested to be written in the buildinfo.
   * pkg-info.mk: Set and export the BUILD_PATH_PREFIX_MAP envvar, as described
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 2562b29..44307d1 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -145,7 +145,7 @@ sub _add_reproducible_flags {
     # Default feature states.
     my %use_feature = (
         timeless => 1,
-        fixdebugpath => 0,
+        fixdebugpath => (get_host_arch() eq 'amd64') ? 0 : 1,
     );
 
     my $build_path;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git