disable building dpdkstat plugin on jessie

diff --git a/debian/changelog b/debian/changelog
index ce25412018f22317242ef9b1a6ffde0f3b5d8b5f..7369b509142c2cc8e1f289d9b41c5959fd89c00e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 collectd (5.7.0-3~bpo8+1) UNRELEASED; urgency=medium
 
   * Rebuild for jessie-backports.
+  * debian/control, debian/rules:
+    - Disable dpdkstat plugin, which build dependencies aren't available in
+      jessie.
 
  -- Marc Fournier <marc@bl.uem.li>  Thu, 05 Jan 2017 21:46:24 +0100
 

diff --git a/debian/control b/debian/control
index d1437e5f4939c741f4f636639bd2821011428de0..39c1ed36684ff3410d6bb721645906d08ddc5e6a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9.20120909~), dpkg-dev (>= 1.14.10), po-debconf, dh
  libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev,
  libdevstat-dev [kfreebsd-any],
  libdbi0-dev,
- libdpdk-dev [amd64 i386],
  libesmtp-dev,
  libganglia1-dev (>= 3) [linux-any],
  libgeom-dev [kfreebsd-any],

diff --git a/debian/rules b/debian/rules
index b3325ec7870a430c57e3f380e30fb5dca1fbbdbf..5bbf9d1836b8cf109aed08e1de724956d79db05b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,9 @@ confflags += --disable-grpc
 # libqpos is required for the intel_rdt plugin.
 confflags += --disable-intel_rdt
 
+# libdpdk is required for the dpdkstat plugin.
+confflags += --disable-dpdkstat
+
 # These plugins are Linux-specific.
 ifneq (,$(filter kfreebsd-i386 kfreebsd-amd64, $(DEB_BUILD_ARCH)))
        confflags += \
@@ -161,7 +164,6 @@ endif
 # These plugins are Intel-hardware specific.
 ifeq (,$(filter amd64 i386, $(DEB_BUILD_ARCH)))
        confflags += \
-               --disable-dpdkstat \
                --disable-turbostat
 endif