From b2553a05fdb508fa5e1c6696a94a74ac8f0b70b4 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 23 Jan 2010 16:01:27 +0000 Subject: [PATCH] control, rules: Disabled iptables, ipvs on kfreebsd. These plugins are Linux-specific. --- debian/changelog | 9 ++++++--- debian/control | 4 ++-- debian/rules | 11 +++++++++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 470b1a7..c45d4df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,10 +20,13 @@ collectd (4.9.1-1) unstable; urgency=low - Install all collectd-*.5 manpages (in particular, this includes the newly added collectd-python.5). * debian/control, debian/rules: - - Disabled the "netlink" plugin on kfreebsd-{i386,amd64} and do not - build-depend on iproute-dev -- iproute is only available on Linux. + - Disabled the following Linux-specific plugins / removed the following + build-deps on kfreebsd-{i386,amd64}: + + "iptables" plugin / iptables-dev + + "ipvs" plugin / linux-libc-dev + + "netlink" plugin / iproute-dev - -- Sebastian Harl Sat, 23 Jan 2010 15:38:38 +0000 + -- Sebastian Harl Sat, 23 Jan 2010 15:56:31 +0000 collectd (4.8.2-1) unstable; urgency=medium diff --git a/debian/control b/debian/control index 8ae88ac..2371706 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Sebastian Harl Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, libltdl-dev, pkg-config, iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64], - iptables-dev (>= 1.4.3.2-2), + iptables-dev (>= 1.4.3.2-2) [!kfreebsd-i386 !kfreebsd-amd64], libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libdbi0-dev, libesmtp-dev, @@ -30,7 +30,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libvirt-dev (>= 0.4.0-6), libxml2-dev, libyajl-dev, - linux-libc-dev (>= 2.6.25-4) | linux-libc-dev (<< 2.6.25-1), + linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64], openjdk-6-jdk [!hppa], python-dev Build-Conflicts: libpthread-dev diff --git a/debian/rules b/debian/rules index 281c8ae..c4c545a 100755 --- a/debian/rules +++ b/debian/rules @@ -87,11 +87,18 @@ 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 (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips \ - mipsel kfreebsd-i386 kfreebsd-amd64)) +ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64 mips mipsel)) confflags += --disable-netlink endif +# These plugins are Linux-specific. +ifneq (,$(findstring $(DEB_BUILD_ARCH),kfreebsd-i386 kfreebsd-amd64)) + confflags += \ + --disable-iptables \ + --disable-ipvs \ + --disable-netlink +endif + # The hppa buildds currently do not keep up with Java related stuff, thus # prevending testing transitions. ifneq (,$(findstring $(DEB_BUILD_ARCH),hppa)) -- 2.30.2