diff --git a/debian/rules b/debian/rules
index b506e2d650b9d13a4674b8cafb3d186adc407b35..8e186fca503f58161e68ce7b29f782fb6c85366e 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)
-CPPFLAGS = `dpkg-buildflags --get CPPFLAGS`
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
CPPFLAGS += -I$(CURDIR)/debian/include
-CFLAGS = `dpkg-buildflags --get CFLAGS`
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
CFLAGS += -Wall
# There is no way to tell lt_dlopen() to use the RTLD_GLOBAL flag which is
CPPFLAGS += -UCONFIGFILE
CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"'
-LDFLAGS = `dpkg-buildflags --get LDFLAGS`
+LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS)
# The archdir map has been copied from openjdk-6's debian/rules.
-JAVA_ARCHDIR_MAP = armel=arm hppa=parisc lpia=i386 powerpc=ppc powerpcspe=ppc sh4=sh
-JAVA_ARCHDIR = $(strip $(patsubst $(DEB_BUILD_ARCH)=%, %, \
- $(filter $(DEB_BUILD_ARCH)=%, $(JAVA_ARCHDIR_MAP))))
+JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH))
ifeq (,$(JAVA_ARCHDIR))
JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
endif
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
-confflags += --disable-apple_sensors --disable-tape
-
-# libmodbus is required for the modbus plugin.
-confflags += --disable-modbus
+# MacOS only (requires IO Kit):
+confflags += --disable-apple_sensors
+# AIX only (requires perfstat):
+confflags += --disable-lpar
+# Solaris only (requires devinfo and kstat)
+confflags += --disable-tape
# libnetapp is required for the netapp plugin.
confflags += --disable-netapp
# libclntsh is required for the oracle plugin.
confflags += --disable-oracle
+# libcredis is required for the *redis plugins.
+confflags += --disable-redis --disable-write_redis
+
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
+# libmongoc is required for the write_mongodb plugin.
+confflags += --disable-write_mongodb
+
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
+ --disable-ethstat \
--disable-iptables \
--disable-ipvs \
--disable-madwifi \
+ --disable-md \
--disable-netlink \
+ --disable-numa \
--disable-sensors \
--disable-vserver
-else
- # configure is not currently able to correctly check for ip_vs.h.
- # ipvs_h_include.dpatch takes care of using the right one. Overwriting
- # KERNEL_DIR makes sure we don't use any kernel headers directly.
- confflags += --enable-ipvs=force KERNEL_DIR=/usr
endif
# These plugins have not been ported to FreeBSD yet.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+ # Work-around an incomplete check for kvm functionality
+ CPPFLAGS += -DHAVE_STRUCT_KINFO_PROC_FREEBSD
+ confflags += --enable-processes=force
+
confflags += \
--disable-battery \
--disable-conntrack \
dh_installexamples -a contrib/collectd2html.pl contrib/collection.cgi \
contrib/collection3/ contrib/php-collection/ \
contrib/exec-munin.conf contrib/exec-munin.px contrib/exec-smartctl \
- contrib/exec-nagios.conf contrib/exec-nagios.px \
+ contrib/exec-nagios.conf contrib/exec-nagios.px contrib/exec-ksm.sh \
contrib/SpamAssassin/ contrib/iptables/ contrib/cussh.pl \
contrib/snmp-data.conf contrib/add_rra.sh contrib/network-proxy.py \
contrib/collectd_network.py contrib/collectd_unixsock.py \