[Pkg-chromium-commit] chromium-browser/chromium-browser.sid: 612 Use dpkg-architecture directly instead of relying on

[Giuseppe Iuculano]

Branch name: chromium-browser/chromium-browser.sid
Branch location : bzr+ssh://bzr.debian.org/bzr/pkg-chromium/chromium-browser/chromium-browser.sid
Browse location: http://bzr.debian.org/loggerhead/pkg-chromium
Revision No: 612
Revision Id: iuculano at debian.org-20100614123348-wpq6s324w0c4s51d
Committer: Giuseppe Iuculano <iuculano at debian.org>
Message : Use dpkg-architecture directly instead of relying on
dpkg-buildpackage to set DEB_*_ARCH variables.  Use
DEB_HOST_ARCH_CPU instead of DEB_BUILD_ARCH to detect target CPU.
(Closes: #585801)


--------------------------------------------------------
  ** Modified :
        - debian/changelog
        - debian/rules

-------------- next part --------------
=== modified file 'debian/changelog'
--- a/debian/changelog	2010-06-13 20:24:14 +0000
+++ b/debian/changelog	2010-06-14 12:33:48 +0000
@@ -1,3 +1,12 @@
+chromium-browser (5.0.375.70~r48679-3) UNRELEASED; urgency=low
+
+  * Use dpkg-architecture directly instead of relying on
+    dpkg-buildpackage to set DEB_*_ARCH variables.  Use
+    DEB_HOST_ARCH_CPU instead of DEB_BUILD_ARCH to detect target CPU.
+    (Closes: #585801)
+
+ -- Jonathan Nieder <jrnieder at gmail.com>  Sun, 13 Jun 2010 17:20:52 -0500
+
 chromium-browser (5.0.375.70~r48679-2) unstable; urgency=low
 
   [ Fabien Tassin ]

=== modified file 'debian/rules'
--- a/debian/rules	2010-06-10 12:36:34 +0000
+++ b/debian/rules	2010-06-14 12:33:48 +0000
@@ -51,7 +51,9 @@
 GYP_DEFINES += werror=$(NULL)
 endif
 
-ifeq (armel,$(DEB_BUILD_ARCH))
+DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
+
+ifeq (armel,$(DEB_HOST_ARCH_CPU))
 AVOID_GCC_44 := 0
 GYP_DEFINES += \
 	arm_thumb=1 \
@@ -62,19 +64,19 @@
 WANT_LZMA_DEBS := 0
 WANT_TESTS     := 0
 ifneq (,$(filter unstable development,$(DEBIAN_DIST)))
-# on $(DEB_BUILD_ARCH) and $(DEBIAN_DIST), enforce an armv7 with thumb build (or not)
+# depending on cpu and distribution, enforce an armv7 with thumb build (or not)
 GYP_DEFINES += \
 	armv7=0 \
 	$(NULL)
 endif
 else
-ifeq (amd64,$(DEB_BUILD_ARCH))
+ifeq (amd64,$(DEB_HOST_ARCH_CPU))
 GYP_DEFINES += target_arch=x64
 else
-ifeq (i386,$(DEB_BUILD_ARCH))
+ifeq (i386,$(DEB_HOST_ARCH_CPU))
 GYP_DEFINES += target_arch=ia32
 else
-$(warning unsupported target arch $(DEB_BUILD_ARCH) - continuing anyway)
+$(warning unsupported target arch $(DEB_HOST_ARCH_CPU) - continuing anyway)
 endif
 endif
 endif
@@ -407,8 +409,8 @@
 	  rm -f $(filter-out en-US.pak,$(notdir $(wildcard $(CURDIR)/debian/$(DEBIAN_NAME)/$(LIB_DIR)/locales/*)))
 	# DEB_ARCH_PACKAGES=$(DEB_ARCH_PACKAGES)
 	# DEB_INDEP_PACKAGES=$(DEB_INDEP_PACKAGES)
-ifneq (i386,$(DEB_BUILD_ARCH_CPU))
-	# DEB_BUILD_ARCH_CPU=$(DEB_BUILD_ARCH_CPU)
+ifneq (i386,$(DEB_HOST_ARCH_CPU))
+	# DEB_HOST_ARCH_CPU=$(DEB_HOST_ARCH_CPU)
 	# We assume we're *not* doing the "Architecture: all" packages so we need
 	# to drop the -l10n files from debian/tmp to make 'compare' happy
 	cd $(CURDIR)/debian/tmp/$(LIB_DIR)/locales && \