From 5c82d9614c83bbb246c42d7a499f5f65f3ac8bfc Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Tue, 5 Jul 2016 14:00:11 +0200 Subject: [PATCH] Disable the sigrok plugin on non-Linux. Restrict build dependency to linux-any. Thanks to Andreas Beckmann for reporting this! Closes: #825606 --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/rules | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ab7a772..7aca5e3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +collectd (5.5.1-5) UNRELEASED; urgency=medium + + * debian/control, debian/rules: + - Disable the sigrok plugin on non-Linux; restrict build dependency to + linux-any; thanks to Andreas Beckmann for reporting this + (Closes: #825606). + + -- Sebastian Harl Tue, 05 Jul 2016 13:58:29 +0200 + collectd (5.5.1-4) unstable; urgency=medium * debian/control: diff --git a/debian/control b/debian/control index f92067e..90e0bbd 100644 --- a/debian/control +++ b/debian/control @@ -37,7 +37,7 @@ Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.14.10), po-debconf, dh-sys librabbitmq-dev, librrd-dev (>= 1.4~), libsensors4-dev [linux-any], - libsigrok-dev (>= 0.2~), + libsigrok-dev (>= 0.2~) [linux-any], # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~)) libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev, libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~), diff --git a/debian/rules b/debian/rules index 2dd1b35..84b4800 100755 --- a/debian/rules +++ b/debian/rules @@ -99,6 +99,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. -- 2.30.2