From: Anders Kaseorg Date: Thu, 24 Jun 2010 01:16:36 +0000 (-0400) Subject: Fix cross-compiling on karmic and lucid. X-Git-Tag: debian/1.11-0debathena3~1 X-Git-Url: http://andersk.mit.edu/gitweb/nss_nonlocal.git/commitdiff_plain/9274b69b56e3468f652ec0557913b0a44e661dfc Fix cross-compiling on karmic and lucid. Signed-off-by: Anders Kaseorg --- diff --git a/debian/changelog b/debian/changelog index 5a65e72..77e2198 100644 --- 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 Wed, 23 Jun 2010 21:04:41 -0400 diff --git a/debian/rules b/debian/rules index 982e191..24e5e55 100755 --- 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)