From 8d95e7729293478f50d8e7fb6a650f69e3b1f5fd Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sun, 2 May 2010 22:31:23 -0400 Subject: [PATCH] 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 --- debian/changelog | 2 ++ debian/rules | 2 ++ 2 files changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 630148d..a918e03 100644 --- 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 Thu, 29 Apr 2010 00:12:44 -0400 diff --git a/debian/rules b/debian/rules index e0d25f3..d41058c 100755 --- 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 -- 2.45.0