[Reproducible-commits] [dpkg] 01/04: dpkg-architecture: disable DEB_HOST_MULTIARCH / DEB_BUILD_MULTIARCH

[Holger Levsen]

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

holger pushed a commit to annotated tag 1.16.1.2_bpo60+1
in repository dpkg.

commit 80b4444b78b0e960d0264b098292fd75a85439f8
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Thu Mar 15 08:17:27 2012 +0100

    dpkg-architecture: disable DEB_HOST_MULTIARCH / DEB_BUILD_MULTIARCH
    
    This is a safety measure to avoid problems with packages that enable
    a multi-arch layout as soon as those variables exist. And we don't want
    to enable multiarch in squeeze-backports.
---
 debian/changelog             | 8 ++++++++
 scripts/dpkg-architecture.pl | 9 +++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 717dd1a..4574374 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dpkg (1.16.1.1~bpo60+3) UNRELEASED; urgency=low
+
+  * Disable DEB_HOST_MULTIARCH / DEB_BUILD_MULTIARCH variables in
+    dpkg-architecture so that packages do not incorrectly enable multiarch in
+    squeeze-backports.
+
+ -- Raphaël Hertzog <hertzog at debian.org>  Thu, 15 Mar 2012 08:11:50 +0100
+
 dpkg (1.16.1.1~bpo60+2) squeeze-backports; urgency=low
 
   * Only build dpkg-dev and libdpkg-perl as discussed with the backports
diff --git a/scripts/dpkg-architecture.pl b/scripts/dpkg-architecture.pl
index e030827..dc5bb4a 100755
--- a/scripts/dpkg-architecture.pl
+++ b/scripts/dpkg-architecture.pl
@@ -125,14 +125,14 @@ while (@ARGV) {
 
 my %v;
 
+# Dropped DEB_*_MULTIARCH for squeeze-backports
 my @ordered = qw(DEB_BUILD_ARCH DEB_BUILD_ARCH_OS DEB_BUILD_ARCH_CPU
                  DEB_BUILD_ARCH_BITS DEB_BUILD_ARCH_ENDIAN
                  DEB_BUILD_GNU_CPU DEB_BUILD_GNU_SYSTEM DEB_BUILD_GNU_TYPE
-                 DEB_BUILD_MULTIARCH
                  DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_ARCH_CPU
                  DEB_HOST_ARCH_BITS DEB_HOST_ARCH_ENDIAN
                  DEB_HOST_GNU_CPU DEB_HOST_GNU_SYSTEM DEB_HOST_GNU_TYPE
-                 DEB_HOST_MULTIARCH);
+                 );
 
 $v{DEB_BUILD_ARCH} = get_raw_build_arch();
 $v{DEB_BUILD_GNU_TYPE} = debarch_to_gnutriplet($v{DEB_BUILD_ARCH});
@@ -193,8 +193,9 @@ my $abi;
 ($v{DEB_HOST_ARCH_BITS}, $v{DEB_HOST_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_HOST_ARCH});
 ($v{DEB_BUILD_ARCH_BITS}, $v{DEB_BUILD_ARCH_ENDIAN}) = debarch_to_cpuattrs($v{DEB_BUILD_ARCH});
 
-$v{DEB_BUILD_MULTIARCH} = debarch_to_multiarch($v{DEB_BUILD_ARCH});
-$v{DEB_HOST_MULTIARCH} = debarch_to_multiarch($v{DEB_HOST_ARCH});
+# Disabled for squeeze-backports
+#$v{DEB_BUILD_MULTIARCH} = debarch_to_multiarch($v{DEB_BUILD_ARCH});
+#$v{DEB_HOST_MULTIARCH} = debarch_to_multiarch($v{DEB_HOST_ARCH});
 
 for my $k (@ordered) {
     $v{$k} = $ENV{$k} if (defined ($ENV{$k}) && !$force);

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