![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/debian/rules b/debian/rules
index c2b1a489e8db3bdd320e27d568683c2eab75d62b..094a50b908dfb42a07e2f51dfdc971f01745fa66 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 = -I$(CURDIR)/debian/include
-CFLAGS = -Wall -g
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+
+CPPFLAGS = $(shell dpkg-buildflags --get CPPFLAGS)
+CPPFLAGS += -I$(CURDIR)/debian/include
+CFLAGS = $(shell dpkg-buildflags --get CFLAGS)
+CFLAGS += -Wall -Wno-error=deprecated-declarations
# 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
CPPFLAGS += -UCONFIGFILE
CPPFLAGS += -DCONFIGFILE='\"/etc/collectd/collectd.conf\"'
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+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
-JAVA_HOME = /usr/lib/jvm/java-6-openjdk
+JAVA_HOME = /usr/lib/jvm/default-java
JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
JAVAC = $(JAVA_HOME)/bin/javac
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr \
--mandir=\$${prefix}/share/man \
--localstatedir=/var --sysconfdir=/etc \
- --with-perl-bindings="INSTALLDIRS=vendor" \
+ --with-perl-bindings="INSTALLDIRS=vendor INSTALL_BASE=" \
--without-libstatgrab \
--without-included-ltdl \
--disable-static \
--enable-all-plugins
# These plugins do not provide any functionality under Linux.
-confflags += --disable-apple_sensors --disable-tape
+# 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
-# libmodbus is required for the modbus plugin.
-confflags += --disable-modbus
+# libaquaero5 is required for the aquaero plugin
+confflags += --disable-aquaero
+
+# libmic is required for the mic plugin
+confflags += --disable-mic
# libnetapp is required for the netapp plugin.
confflags += --disable-netapp
# librouteros is required for the routeros plugin.
confflags += --disable-routeros
+# libsigrok >= 0.2.0 is required for the sigrok plugin, should arrive in unstable soon
+confflags += --disable-sigrok
+
+# varnish does not currently work with varnish4
+# (c.f. https://bugs.debian.org/745902)
+confflags += --disable-varnish
+
+# libmongoc is required for the write_mongodb plugin.
+confflags += --disable-write_mongodb
+
# xmms1 is required for the xmms plugin.
confflags += --disable-xmms
# libkstat is required for the xfs_arc plugin.
confflags += --disable-zfs-arc
-# The static library netstat cannot be linked into shared objects on some
-# architectures (see bugs #358637, #419684 and #524593 for more details).
-ifneq (,$(filter alpha amd64 hppa ia64 ppc64 mips mipsel, $(DEB_BUILD_ARCH)))
- confflags += --disable-netlink
-endif
-
# These plugins are Linux-specific.
ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
confflags += \
+ --disable-cgroups \
+ --disable-ethstat \
--disable-iptables \
--disable-ipvs \
+ --disable-lvm \
--disable-madwifi \
+ --disable-md \
--disable-netlink \
+ --disable-numa \
--disable-sensors \
--disable-vserver
endif
+# This plugin is FreeBSD-specific.
+ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
+ confflags += \
+ --disable-pf
+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 \
> debian/pkgconfig/OpenIPMIpthread.pc
PKG_CONFIG_PATH="$(CURDIR)/debian/pkgconfig:$$PKG_CONFIG_PATH" \
- ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" \
+ ./configure $(confflags) CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
JAVAC="$(JAVAC)" JAR="$(JAR)" JAVA_CPPFLAGS="$(JAVA_CPPFLAGS)" \
JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
|| ( status=$$?; cat config.log; exit $$status )
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
build-stamp: config.status
dh_testdir
dh_clean -k
dh_installdirs -i
dh_install -i
+
+ # update include path for collectd header files
+ sed -r -i -e 's/include "(.*)"/include "collectd\/core\/\1"/' \
+ $(CURDIR)/debian/collectd-dev/usr/include/collectd/core/*
+ sed -r -i -e 's/"collectd\/core\/(liboconfig\/.*)"/"collectd\/\1"/' \
+ $(CURDIR)/debian/collectd-dev/usr/include/collectd/core/*
install-arch: build
dh_testdir
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 \
contrib/snmp-probe-host.px contrib/GenericJMX.conf \
+ contrib/postgresql \
debian/collectd.conf debian/filters.conf debian/thresholds.conf
# some upstream tarballs have been built inside a dirty working dir
( cd debian/collectd-core/ \
dh_builddeb -a
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install-indep install-arch
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install-indep install-arch