diff --git a/debian/rules b/debian/rules
index 9e16d997400f52ea259173b088f53adc1269eccb..885d758d39807fa1590f39f18a416982e7b311ba 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-CFLAGS = -Wall -g -I$(CURDIR)/debian/include
+CPPFLAGS = -I$(CURDIR)/debian/include
+CFLAGS = -Wall -g
# There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is
# however required by the perl plugin (which would otherwise be unable to find
# symbols defined in libperl when loading perl modules that require such
# symbols). This is a workaround for this issue.
-CFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
+CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
# The static libraries iptc, netstat and upsclient cannot be used on
# 64bit systems (see bugs #358637 and #419684 for more details).
ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64))
- confflags += --disable-iptables --disable-netlink --disable-nut
+ confflags += --disable-netlink --disable-nut
endif
# libvirt is only available on amd64, i386 and powerpc.
confflags += --disable-libvirt
endif
+# Force the inclusion of the ipmi plugin and manually specify its
+# dependencies to work around #474087 (broken openipmi .pc files).
+BUILD_WITH_OPENIPMI_LIBS = -lOpenIPMIpthread
+confflags += --enable-ipmi
+
config.status: configure $(DPATCH_STAMPFN)
dh_testdir
- CFLAGS="$(CFLAGS)" ./configure $(confflags)
+ BUILD_WITH_OPENIPMI_LIBS="$(BUILD_WITH_OPENIPMI_LIBS)" \
+ CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" ./configure $(confflags)
build: build-stamp
debian/collectd/etc/collectd/thresholds.conf
mkdir -p debian/collectd/usr/lib/collectd/utils/
- for UTIL in extractDS.px migrate-3-4.px; do \
+ for UTIL in rrd_filter.px migrate-3-4.px; do \
cp contrib/$$UTIL debian/collectd/usr/lib/collectd/utils/; \
done