From a610a5b5bbe67f324fc268603060516185b2cd89 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 27 Sep 2014 19:55:04 +0000 Subject: [PATCH] rules: Disable preprocessor warnings on kfreebsd. This is to work around an error resulting from a redefined macro in PostgreSQL's pg_config_manual.h. Thanks to Ivo De Decker for reporting this. Closes: #760719 --- debian/changelog | 9 +++++++++ debian/rules | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/debian/changelog b/debian/changelog index fb49335..5d18ccf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +collectd (5.4.1-4) UNRELEASED; urgency=medium + + * debian/rules: + - Disable preprocessor warnings on kfreebsd to work around an error + resulting from a redefined macro in PostgreSQL's pg_config_manual.h; + thanks to Ivo De Decker for reporting this (Closes: #760719). + + -- Sebastian Harl Sat, 27 Sep 2014 19:51:49 +0000 + collectd (5.4.1-3) unstable; urgency=medium * debian/control: diff --git a/debian/rules b/debian/rules index 11ef4cc..168bb18 100755 --- a/debian/rules +++ b/debian/rules @@ -30,6 +30,12 @@ CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL' CPPFLAGS += -UCONFIGFILE CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"' +# A PostgreSQL header redefines CACHE_LINE_SIZE on FreeBSD. +# Cf. https://bugs.debian.org/760719 and https://bugs.debian.org/763098 +ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH))) + CPPFLAGS += -Wp,-w +endif + LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) # The archdir map has been copied from openjdk-6's debian/rules. -- 2.30.2