Disable the netlink plugin on alpha, amd64, hppa, ia64 and ppc64.

libnetlink is only available as a static library compiled without -fPIC and
thus cannot be linked into a shared object on those architectures.

diff --git a/debian/changelog b/debian/changelog
index d2f81a2f5cabb4a14c19e49f5b55c948672b485f..4ca0ea0d0ff381b0b370e0cafbb0aa5de9ba0cf4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ collectd (4.1.2-1) experimental; urgency=low
     - Added options to collectd2html.pl to specify host and data directory
       (Closes: #438499).
     New plugins:
-    - Detailed Linux network interface and routing statistics: netlink
+    - Detailed Linux network interface and routing statistics: netlink (32bit
+      systems only)
     - Values from SNMP enabled network devices: snmp
     - Bitrate and frequency of music played with XMMS: xmms
   * Updated init script to wait for collectd to shut down (Closes: #422208).

diff --git a/debian/rules b/debian/rules
index 3ab7f129c318ba178aa1296d41b488ca04d2f4ed..46addb8713d5ae208d366a5b2ed9657513ef4ad1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -31,10 +31,10 @@ confflags = --host=$(DEB_HOST_GNU_TYPE) \
 # These plugins do not provide any functionality under Linux.
 confflags += --disable-apple_sensors --disable-tape
 
-# The static libraries iptc and upsclient cannot be used on 64bit systems
-# (see bugs #358637 and #419684 for more details).
+# The static libraries iptc, netstat and upsclient cannot be used on
+# 64bit systems (see bugs #358637 and #419684 for more details).
 ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64))
-       confflags += --disable-iptables --disable-nut
+       confflags += --disable-iptables --disable-netlink --disable-nut
 endif
 
 config.status: configure $(DPATCH_STAMPFN)