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

[Peter Pearse]

Unmerged revisions

41. By Peter Pearse on 2011-04-08

Patch for cross building.

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-25 10:48:27 +0000
+++ debian/changelog	2011-04-08 14:44:25 +0000
@@ -1,3 +1,9 @@
+libxml2 (2.7.8.dfsg-2ubuntu1) natty; urgency=low
+
+  * Patch for cross building
+
+ -- Peter Pearse <[e-mail]>  Fri, 08 Apr 2011 08:49:59 +0000
+
 libxml2 (2.7.8.dfsg-2) unstable; urgency=low
 
   * xpath.c: Fix a double-freeing error in XPath processing code.

=== modified file 'debian/rules'
--- debian/rules	2010-06-29 12:42:35 +0000
+++ debian/rules	2011-04-08 14:44:25 +0000
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
 # The versions of python currently supported
 PYVERS=$(shell pyversions -s)
 # The current default version of python
@@ -26,6 +29,14 @@
 endif
 
 CONFIGURE_FLAGS := --with-history CC="gcc -Wl,--as-needed" CFLAGS="$(CFLAGS)" --cache-file="$(CURDIR)/build/config.cache"
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+        CONFIGURE_FLAGS += --host $(DEB_HOST_GNU_TYPE) --build $(DEB_BUILD_GNU_TYPE)
+        CONFIGURE_FLAGS += CC="$(DEB_HOST_GNU_TYPE)-gcc -Wl,--as-needed"
+else
+        CONFIGURE_FLAGS += CC="gcc -Wl,--as-needed"
+endif
+
+
 
 override_dh_auto_configure: $(TARGETS:%=configure-%)