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

[Peter Pearse]

Just needs the standard host/build & CC changes

[Steve Langasek (vorlon)]

+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ CONFIGURE = CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif

That's not really standard, shouldn't autoconf pick this up for us automatically without having to set CC explicitly?

review: Needs Information

[Steve Langasek (vorlon)]

nevermind, tested for myself and see that it doesn't pick up CC without this change. :/

=== modified file 'debian/changelog'
--- debian/changelog	2009-12-04 09:28:09 +0000
+++ debian/changelog	2011-02-16 16:05:28 +0000
@@ -1,3 +1,9 @@
+blt (2.4z-4.2ubuntu1) natty; urgency=low
+
+  * Patch debian/rules for cross building
+
+ -- Peter Pearse <[e-mail]>  Wed, 16 Feb 2011 16:00:03 +0000
+
 blt (2.4z-4.2) unstable; urgency=low
 
   * Non-maintainer upload.

=== modified file 'debian/rules'
--- debian/rules	2009-12-04 09:28:09 +0000
+++ debian/rules	2011-02-16 16:05:28 +0000
@@ -4,15 +4,25 @@
 # This has to be exported to make some magic below work.
 export DH_OPTIONS
 
+DEB_BUILD_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE       ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 
 # useful variables
 v = 2.4
 
 dtmp = $(shell pwd)/debian/tmp
 
-CONFIGURE = ./configure --prefix=/usr/ --mandir=/usr/share/man \
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+        CONFIGURE = CC=$(DEB_HOST_GNU_TYPE)-gcc
+endif
+
+CONFIGURE += ./configure --prefix=/usr/ --mandir=/usr/share/man \
 	--with-cflags="-O2 -g -D_REENTRANT"
 
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+        CONFIGURE += --host $(DEB_HOST_GNU_TYPE) --build $(DEB_BUILD_GNU_TYPE)
+endif
+
 # Now, the build targets...
 
 build: build-stamp