[Pkg-dspam-commits] [SCM] Debian packages for the DSPAM anti-spam filter branch, master, updated. debian/3.9.1_rc1+git20110514.347379b+dfsg-1-11-g6f71ed2

[Thomas Preud'homme]

The following commit has been merged in the master branch:
commit 6f71ed22626f1b84cbfb034a77e96f161f397d06
Author: Thomas Preud'homme <thomas.preudhomme at celest.fr>
Date:   Thu Jun 16 16:07:49 2011 +0200

    Actually export CPPFLAGS and CFLAGS in rules
    
    * Export CPPFLAGS and CFLAGS in debian/rules
    * Make CPPFLAGS, CFLAGS and LDFLAGS simply extended variables
      (use of := instead of =)
    
    This is needed to avoid depending on debhelper (>= 8.9.0) and thus ease
    backports.

diff --git a/debian/rules b/debian/rules
index 7cb3774..e5249ca 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,13 +34,19 @@ ifeq (,$(findstring disable_clamav,$(DEB_BUILD_OPTIONS)))
         CONFIGURE += --enable-clamav
 endif
 
+# Needed to not depend on debhelper 8.9.0 (and thus ease backports)
+CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+
+# Without any effect for now due to http://bugs.debian.org/347650
+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+LDFLAGS+=-Wl,-z,defs -Wl,--as-needed
+
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-LDFLAGS := -Wl,-z,defs -Wl,--as-needed
-
 %:
 	dh $@ --with autoreconf
 

-- 
Debian packages for the DSPAM anti-spam filter