The following commit has been merged in the sid branch:
commit ceb939d278689634037115a728fd7c083d0e4a39
Author: Thorsten Glaser <[email protected]>
Date: Sat Oct 8 17:25:08 2011 +0000
scripts/mk: Fix typo by setting DEB_*_ARCH_BITS instead of DEB_*_ARCH
Signed-off-by: Thorsten Glaser <[email protected]>
Signed-off-by: Guillem Jover <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 69ba2e8..cb6e194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ dpkg (1.16.1.1) UNRELEASED; urgency=low
[ Guillem Jover ]
* Change dpkg-buildflags to set preprocessor option -D_FORTIFY_SOURCE=2
in CPPFLAGS, instead of CFLAGS and CXXFLAGS. Closes: #642521, #643632
+ * Fix typo to correctly set DEB_*_ARCH_BITS instead of DEB_*_ARCH in
+ architecture.mk. Thanks to Thorsten Glaser <[email protected]>.
-- Raphaël Hertzog <[email protected]> Tue, 27 Sep 2011 08:15:51 +0200
diff --git a/scripts/mk/architecture.mk b/scripts/mk/architecture.mk
index 4379e00..56eaabe 100644
--- a/scripts/mk/architecture.mk
+++ b/scripts/mk/architecture.mk
@@ -7,7 +7,7 @@ dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval
DPKG_CACHE_$(1) := $(shel
DEB_HOST_ARCH ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture
-qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(call dpkg_late_eval,DEB_HOST_ARCH_OS,dpkg-architecture
-qDEB_HOST_ARCH_OS)
DEB_HOST_ARCH_CPU ?= $(call dpkg_late_eval,DEB_HOST_ARCH_CPU,dpkg-architecture
-qDEB_HOST_ARCH_CPU)
-DEB_HOST_ARCH ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture
-qDEB_HOST_ARCH_BITS)
+DEB_HOST_ARCH_BITS ?= $(call dpkg_late_eval,DEB_HOST_ARCH,dpkg-architecture
-qDEB_HOST_ARCH_BITS)
DEB_HOST_ARCH_ENDIAN ?= $(call
dpkg_late_eval,DEB_HOST_ARCH_ENDIAN,dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
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)
@@ -17,7 +17,7 @@ DEB_HOST_MULTIARCH ?= $(call
dpkg_late_eval,DEB_HOST_MULTIARCH,dpkg-architecture
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)
DEB_BUILD_ARCH_CPU ?= $(call
dpkg_late_eval,DEB_BUILD_ARCH_CPU,dpkg-architecture -qDEB_BUILD_ARCH_CPU)
-DEB_BUILD_ARCH ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture
-qDEB_BUILD_ARCH_BITS)
+DEB_BUILD_ARCH_BITS ?= $(call dpkg_late_eval,DEB_BUILD_ARCH,dpkg-architecture
-qDEB_BUILD_ARCH_BITS)
DEB_BUILD_ARCH_ENDIAN ?= $(call
dpkg_late_eval,DEB_BUILD_ARCH_ENDIAN,dpkg-architecture -qDEB_BUILD_ARCH_ENDIAN)
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)
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
