From 3cad8137ea52b838a798c8be7f26525fe2993134 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Thu, 29 Apr 2010 03:35:03 -0400 Subject: [PATCH] =?utf8?q?Fix=20CDBS=200.4.77=E2=80=99s=20incorrect=20spli?= =?utf8?q?tting=20of=20multiword=20$(CC).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit See http://bugs.debian.org/576967 . Signed-off-by: Anders Kaseorg --- debian/changelog | 2 ++ debian/rules | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4ef61cb..630148d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ libnss-nonlocal (1.11-0debathena1) UNRELEASED; urgency=low users * Update build flags for biarch packages (fixes lib32nss-nonlocal path on squeeze). + * Fix FTBFS on squeeze due to CDBS’s buggy splitting of multiword + $(CC) (Debian bug #576967). * 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 c92070c..e0d25f3 100755 --- a/debian/rules +++ b/debian/rules @@ -6,6 +6,10 @@ DEB_AUTO_UPDATE_AUTOMAKE = 1.9 DEB_AUTO_UPDATE_ACLOCAL = 1.9 DEB_AUTO_UPDATE_LIBTOOL = pre +# Fix http://bugs.debian.org/576967 : CDBS 0.4.77 in squeeze +# incorrectly splits multiword $(CC) and $(CXX). +override cdbs_set_nondefaultvars = $(foreach var,$1,$(if $(filter-out $(origin $(var)),default),$(var)='$($(var))')) + include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk -- 2.45.0