[Reproducible-commits] [dpkg] 02/04: scripts/mk: disable DEB_HOST_MULTIARCH and 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 3c04ec77792a859332df37dfc151960f551c1b1f
Author: Raphaël Hertzog <hertzog at debian.org>
Date:   Thu Mar 15 08:20:28 2012 +0100

    scripts/mk: disable DEB_HOST_MULTIARCH and DEB_BUILD_MULTIARCH
    
    Since dpkg-architecture has been modified to no longer recognize
    those 2 variables for squeeze-backports, we disable them in
    scripts/mk/architecture.mk too.
---
 debian/changelog           | 1 +
 scripts/mk/architecture.mk | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4574374..39466ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ 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.
+  * Do the same for /usr/share/dpkg/architecture.mk.
 
  -- Raphaël Hertzog <hertzog at debian.org>  Thu, 15 Mar 2012 08:11:50 +0100
 
diff --git a/scripts/mk/architecture.mk b/scripts/mk/architecture.mk
index 56eaabe..5364ad4 100644
--- a/scripts/mk/architecture.mk
+++ b/scripts/mk/architecture.mk
@@ -12,7 +12,8 @@ DEB_HOST_ARCH_ENDIAN ?= $(call dpkg_late_eval,DEB_HOST_ARCH_ENDIAN,dpkg-architec
 DEB_HOST_GNU_CPU ?= $(call dpkg_late_eval,DEB_HOST_GNU_CPU,dpkg-architecture -qDEB_HOST_GNU_CPU)
 DEB_HOST_GNU_SYSTEM ?= $(call dpkg_late_eval,DEB_HOST_GNU_SYSTEM,dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 DEB_HOST_GNU_TYPE ?= $(call dpkg_late_eval,DEB_HOST_GNU_TYPE,dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_HOST_MULTIARCH ?= $(call dpkg_late_eval,DEB_HOST_MULTIARCH,dpkg-architecture -qDEB_HOST_MULTIARCH)
+# Disabled for squeeze-backports
+#DEB_HOST_MULTIARCH ?= $(call dpkg_late_eval,DEB_HOST_MULTIARCH,dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 DEB_BUILD_ARCH ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_ARCH_OS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_OS,dpkg-architecture -qDEB_BUILD_ARCH_OS)
@@ -22,4 +23,5 @@ DEB_BUILD_ARCH_ENDIAN ?= $(call dpkg_late_eval,DEB_BUILD_ARCH_ENDIAN,dpkg-archit
 DEB_BUILD_GNU_CPU ?= $(call dpkg_late_eval,DEB_BUILD_GNU_CPU,dpkg-architecture -qDEB_BUILD_GNU_CPU)
 DEB_BUILD_GNU_SYSTEM ?= $(call dpkg_late_eval,DEB_BUILD_GNU_SYSTEM,dpkg-architecture -qDEB_BUILD_GNU_SYSTEM)
 DEB_BUILD_GNU_TYPE ?= $(call dpkg_late_eval,DEB_BUILD_GNU_TYPE,dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_MULTIARCH ?= $(call dpkg_late_eval,DEB_BUILD_MULTIARCH,dpkg-architecture -qDEB_BUILD_MULTIARCH)
+# Disabled for squeeze-backports
+#DEB_BUILD_MULTIARCH ?= $(call dpkg_late_eval,DEB_BUILD_MULTIARCH,dpkg-architecture -qDEB_BUILD_MULTIARCH)

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