[Pkg-openldap-devel] r957 - openldap/trunk/debian

[Russ Allbery]

Author: rra
Date: 2007-12-21 21:30:31 +0000 (Fri, 21 Dec 2007)
New Revision: 957

Modified:
   openldap/trunk/debian/changelog
   openldap/trunk/debian/rules
Log:
  - Tell configure the system type.

Modified: openldap/trunk/debian/changelog
===================================================================
--- openldap/trunk/debian/changelog	2007-12-21 21:05:19 UTC (rev 956)
+++ openldap/trunk/debian/changelog	2007-12-21 21:30:31 UTC (rev 957)
@@ -79,6 +79,7 @@
     - Refresh all patches to remove diff garbage and trailing whitespace.
   * debian/rules cleanup:
     - Fix patch dependencies for parallel build (hopefully).
+    - Tell configure the system type.
     - Remove stamp files as the first step of the clean target.
     - Add trivial build-arch and build-indep targets.
     - Remove dead code and unnecessary comments.

Modified: openldap/trunk/debian/rules
===================================================================
--- openldap/trunk/debian/rules	2007-12-21 21:05:19 UTC (rev 956)
+++ openldap/trunk/debian/rules	2007-12-21 21:30:31 UTC (rev 957)
@@ -19,6 +19,15 @@
     CFLAGS += -O2
 endif
 
+# Tell Autoconf the correct system types.
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+    SYSTEM = --build $(DEB_HOST_GNU_TYPE)
+else
+    SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
+
 CONFIG		= $(shell grep -v "^\#" debian/configure.options)
 
 installdir	:= $(CURDIR)/debian/install
@@ -54,7 +63,7 @@
 	chmod 755 $(CURDIR)/autogen.sh
 	./autogen.sh
 	cd $(builddir) && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
-		$(CONFIG) 
+		$(CONFIG) $(SYSTEM)
 	perl debian/check_config
 	$(MAKE) -C $(builddir) depend