X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=078243f2ad1bc7abfd5cae5e381859310a3a1f4b;hb=ff1a4cceff6a3903746113c3ff537ac2726ab370;hp=3afddd29617f0a8db845f14e502afb4a9feddba0;hpb=f7d24ed747051da4456155cf6ac0ec126b894d43;p=pkg-collectd.git

diff --git a/debian/rules b/debian/rules
index 3afddd2..078243f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,12 +19,6 @@ 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
-# symbols defined in libperl when loading perl modules that require such
-# symbols). This is a workaround for this issue.
-CPPFLAGS += -DLT_LAZY_OR_NOW='RTLD_LAZY|RTLD_GLOBAL'
-
 # Upstream defaults to ${sysconfdir}/collectd.conf. Setting ${sysconfdir} to
 # /etc/collectd would be wrong though.
 CPPFLAGS += -UCONFIGFILE
@@ -91,10 +85,14 @@ confflags += --disable-write_mongodb
 # xmms1 is required for the xmms plugin.
 confflags += --disable-xmms
 
+# protobuf-compiler >= 3.0.0 and libgrpc++ are required for the grpc plugin.
+confflags += --disable-grpc
+
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += \
 		--disable-cgroups \
+		--disable-cpusleep \
 		--disable-ethstat \
 		--disable-iptables \
 		--disable-ipvs \
@@ -105,6 +103,10 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 		--disable-numa \
 		--disable-sensors \
 		--disable-vserver
+	# libsigrok >= 0.2.0 is required for the sigrok plugin,
+	# only available on Linux.
+	confflags += \
+		--disable-sigrok
 endif
 
 # This plugin is FreeBSD-specific.
@@ -113,6 +115,10 @@ ifeq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 		--disable-pf
 endif
 
+# This plugin is Solaris-specific.
+confflags += \
+		--disable-zone
+
 # 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
@@ -124,7 +130,6 @@ ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 		--disable-conntrack \
 		--disable-contextswitch \
 		--disable-cpufreq \
-		--disable-disk \
 		--disable-entropy \
 		--disable-fscache \
 		--disable-irq \
@@ -151,6 +156,12 @@ ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
 		--disable-turbostat
 endif
 
+# This plugin is x86 and arm specific.
+ifeq (,$(filter amd64 arm64 armhf i386, $(DEB_BUILD_ARCH)))
+	confflags += \
+		--disable-xencpu
+endif
+
 # libatasmart isn't available on these platforms.
 ifneq (,$(filter hurd-i386 kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
 	confflags += --disable-smart
@@ -163,9 +174,15 @@ ifneq (,$(filter hppa sparc, $(DEB_BUILD_ARCH)))
 	confflags += --disable-java
 endif
 
-config.status: configure
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+
+build-stamp:
 	dh_testdir
 	
+	dh_autoreconf
+	
 	# This is a work-around for #474087 (broken openipmi .pc files).
 	mkdir debian/pkgconfig
 	sed -re 's/^(Requires:.*) pthread(.*)$$/\1\2/' \
@@ -178,13 +195,6 @@ config.status: configure
 		JAVA_LDFLAGS="$(JAVA_LDFLAGS)" \
 		|| ( status=$$?; cat config.log; exit $$status )
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	
 	$(MAKE)
 	perl ./debian/bin/check_plugins.pl
 	
@@ -202,13 +212,14 @@ clean:
 	
 	rm -rf debian/pkgconfig
 	
+	dh_autoreconf_clean
 	dh_clean
 	debconf-updatepo
 
 install-indep:
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs -i
 	dh_install -i
 	
@@ -226,7 +237,7 @@ install-indep:
 install-arch: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs -a
 	
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
@@ -281,9 +292,9 @@ binary-arch: build install-arch
 		&& rm -f lib/Collectd/Graph/File.pm lib/Collectd/Graph/Filter.pm \
 		&& rm -f lib/Collectd/Graph/MetaData.pm )
 	dh_installdebconf -a
-	dh_systemd_enable -pcollectd-core --name=collectd collectd.service
+	dh_systemd_enable -pcollectd-core --name=collectd
 	dh_installinit -pcollectd-core --name=collectd -- defaults 95
-	dh_systemd_start
+	dh_systemd_start -pcollectd-core
 	dh_link -a
 	dh_strip -a --dbg-package=collectd-dbg
 	dh_strip_nondeterminism -pcollectd-core