[Glibc-bsd-commits] r4372 - trunk/libbsd/debian

[Guillem Jover]

Author: guillem
Date: 2012-11-23 00:34:13 +0000 (Fri, 23 Nov 2012)
New Revision: 4372

Modified:
   trunk/libbsd/debian/changelog
   trunk/libbsd/debian/rules
Log:
libbsd: Fix cross-building support

By passing correct --build and --host options to configure.

Based-on-patch-by: Colin Watson <cjwatson at ubuntu.com>
Closes: #665997


Modified: trunk/libbsd/debian/changelog
===================================================================
--- trunk/libbsd/debian/changelog	2012-11-03 02:50:03 UTC (rev 4371)
+++ trunk/libbsd/debian/changelog	2012-11-23 00:34:13 UTC (rev 4372)
@@ -1,3 +1,11 @@
+libbsd (0.4.2-2) UNRELEASED; urgency=low
+
+  * Fix cross-building support by passing correct --build and --host options
+    to configure. Based on patch by Colin Watson <cjwatson at ubuntu.com>.
+    (Closes: #665997)
+
+ -- Guillem Jover <guillem at debian.org>  Fri, 23 Nov 2012 01:29:55 +0100
+
 libbsd (0.4.2-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libbsd/debian/rules
===================================================================
--- trunk/libbsd/debian/rules	2012-11-03 02:50:03 UTC (rev 4371)
+++ trunk/libbsd/debian/rules	2012-11-23 00:34:13 UTC (rev 4372)
@@ -3,12 +3,19 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
 LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	confflags += --build=$(DEB_HOST_GNU_TYPE)
+else
+	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
 
 lib := libbsd0
 libdbg := $(lib)-dbg
@@ -22,6 +29,7 @@
 		CPPFLAGS="$(CPPFLAGS)" \
 		CFLAGS="$(CFLAGS)" \
 		LDFLAGS="$(LDFLAGS)" \
+		$(confflags) \
 		--disable-silent-rules \
 		--prefix=/usr \
 		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)