Source: chromium-browser
Version: 5.0.375.70~r48679-1
Tags: patch
Hi Giuseppe,
Trying to run "debian/rules get-orig-source" yields the following warning:
debian/rules:77: unsupported target arch - continuing anyway
Packages are supposed to get the target cpu type from
dpkg-architecture -qDEB_HOST_ARCH_CPU
rather than relying on dpkg-buildpackage to provide them. As a bonus,
this command yields the correct answer when cross-compiling and for
*-kfreebsd and *-hurd architectures, too.
Thoughts?
=== modified file 'debian/changelog'
--- debian/changelog 2010-06-10 15:25:48 +0000
+++ debian/changelog 2010-06-13 22:22:11 +0000
@@ -1,3 +1,11 @@
+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.
+
+ -- Jonathan Nieder <jrnie...@gmail.com> Sun, 13 Jun 2010 17:20:52 -0500
+
chromium-browser (5.0.375.70~r48679-2) UNRELEASED; urgency=low
[ Fabien Tassin ]
=== modified file 'debian/rules'
--- debian/rules 2010-06-10 12:36:34 +0000
+++ debian/rules 2010-06-13 22:18:54 +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 && \
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
