Fix cross-compiling on karmic and lucid.

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

diff --git a/debian/changelog b/debian/changelog
index 5a65e7287b794eefef99de263c9ecc1ee7c0c9b3..77e21982afd3a7aa9486994dd509f2dbae1de270 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libnss-nonlocal (1.11-0debathena3) UNRELEASED; urgency=low
 
   * Remove the workaround for buggy CDBS $(CC) splitting (fixed upstream).
+  * Fix cross-compiling on karmic and lucid.
 
  -- Anders Kaseorg <andersk@mit.edu>  Wed, 23 Jun 2010 21:04:41 -0400
 

diff --git a/debian/rules b/debian/rules
index 982e1916007d8f68674677ce0d4894f5b354f8a9..24e5e551cdc456f61513e975e9a035a1cff2d47c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -61,6 +61,9 @@ configure/lib64nss-nonlocal:: CC += -m64 -D__x86_64__
 # amd64_slibdir in eglibc/debian/sysdeps/i386.mk
 configure/lib64nss-nonlocal:: DEB_CONFIGURE_EXTRA_FLAGS += --libdir="\$${prefix}/lib64"
 
+# Fix for CDBS ≥ 0.4.59ubuntu4, < 0.4.83ubuntu1 (karmic and lucid).
+configure/lib32nss-nonlocal configure/lib64nss-nonlocal:: DEB_CONFIGURE_SCRIPT_ENV += CC="$(CC)"
+
 configure/lib32nss-nonlocal configure/lib64nss-nonlocal::
        $(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)