Merge lp:~peter-pearse/ubuntu/natty/gmp/prop001 into lp:ubuntu/natty/gmp

[Peter Pearse]

Strip spaces from the GNU_TYPES otherwise later debhelper utilities get confused.
Pass --target for cross builds.

[Steve Langasek (vorlon)]

Rather than calling $(strip), I think we might just remove the unnecessary whitespace in debian/rules.

Also, we can simply do without this $(subst) at all, it's completely unnecessary on Debian or Ubuntu for the past 4 years or so. Fixed up and merged.

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-25 07:07:18 +0000
+++ debian/changelog	2011-03-01 11:51:59 +0000
@@ -1,3 +1,9 @@
+gmp (2:4.3.2+dfsg-1ubuntu2) natty; urgency=low
+
+  * For cross builds, strip GNU_TYPES & pass --target
+
+ -- Peter Pearse <[e-mail]>  Tue, 01 Mar 2011 11:47:29 +0000
+
 gmp (2:4.3.2+dfsg-1ubuntu1) lucid; urgency=low
 
   * Support for thumb2 instructions in arm assembler (LP: #51372)
 
=== modified file 'debian/rules'
--- debian/rules	2010-02-25 07:07:18 +0000
+++ debian/rules	2011-03-01 11:51:59 +0000
@@ -16,8 +16,8 @@
 endif
 
 DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-export DEB_HOST_GNU_TYPE  := $(subst i386,i486, $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE))
-export DEB_BUILD_GNU_TYPE := $(subst i386,i486, $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE))
+export DEB_HOST_GNU_TYPE  := $(strip $(subst i386,i486, $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)))
+export DEB_BUILD_GNU_TYPE := $(strip $(subst i386,i486, $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)))
 
 MAKE_CHECK = : disabled make check
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
@@ -52,7 +52,7 @@
   confflags_build += --build $(DEB_BUILD_GNU_TYPE)
 else
   AR = $(DEB_HOST_GNU_TYPE)-ar
-  confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+  confflags_build += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) --target $(DEB_HOST_GNU_TYPE)
 endif
 
 ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 ppc64 kfreebsd-amd64))