Disable CDBS cross-building logic.

This fixes a mysterious FTBFS on squeeze, where configuring with
--host=x86_64-linux-gnu on i386 or --host=i486-linux-gnu on amd64
causes configure to fail to find nm.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

diff --git a/debian/changelog b/debian/changelog
index 630148d5aec3c3edc72fe832835b565070fe3fb4..a918e0370cff170aff794d2ea46104d0d2744add 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ libnss-nonlocal (1.11-0debathena1) UNRELEASED; urgency=low
     on squeeze).
   * Fix FTBFS on squeeze due to CDBS’s buggy splitting of multiword
     $(CC) (Debian bug #576967).
+  * Disable CDBS cross-building logic, to fix a mysterious FTBFS where
+    configure --host fails to find nm.
   * Bump Standards-Version to 3.8.4 (no changes required).
 
  -- Anders Kaseorg <andersk@mit.edu>  Thu, 29 Apr 2010 00:12:44 -0400

diff --git a/debian/rules b/debian/rules
index e0d25f323e99ffb58fb53ad1a55b417329c50b1e..d41058c757d07a0e076cb08c1e66bc14cc895c1b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -37,6 +37,7 @@ REAL_DEB_HOST_GNU_TYPE := $(DEB_HOST_GNU_TYPE)
 
 DEB_BUILDDIR_lib32nss-nonlocal = debian/build_32
 cleanbuilddir/lib32nss-nonlocal:: clean/lib32nss-nonlocal
+configure/lib32nss-nonlocal:: cdbs_crossbuild =
 # i386_configure_target in eglibc/debian/sysdeps/amd64.mk
 ifeq ($(or $(IS_UBUNTU), $(call libc6_ge, 2.8+20080809)), y)
 configure/lib32nss-nonlocal:: DEB_BUILD_GNU_TYPE = i686-linux
@@ -54,6 +55,7 @@ endif
 
 DEB_BUILDDIR_lib64nss-nonlocal = debian/build_64
 cleanbuilddir/lib64nss-nonlocal:: clean/lib64nss-nonlocal
+configure/lib64nss-nonlocal:: cdbs_crossbuild =
 # amd64_configure_target in eglibc/debian/sysdeps/i386.mk
 configure/lib64nss-nonlocal:: DEB_BUILD_GNU_TYPE = x86_64-linux
 # amd64_CC in eglibc/debian/sysdeps/i386.mk