From 352e471ef2672df37a3bf39c1729e2d74f3e97bf Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Sat, 30 Jun 2007 00:30:51 +0200 Subject: [PATCH] Disabled iptables and nut plugins on hppa as well. Frank Lichtenheld reported a FTBFS on hppa due to linking a static library build without -fPIC into a shared object. This is most likely caused by bugs #358637 and #419684. --- debian/changelog | 4 +++- debian/control | 2 +- debian/rules | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 24a5b65..3c5cadf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ collectd (4.0.4-1) experimental; urgency=low * New upstream release. + * Disable iptables and nut plugins on hppa as well to work around a FTBFS + caused by #358637 and presumably #419684 (Closes: #430933). - -- Sebastian Harl Mon, 25 Jun 2007 09:24:59 +0200 + -- Sebastian Harl Sat, 30 Jun 2007 00:12:12 +0200 collectd (4.0.3-1) experimental; urgency=low diff --git a/debian/control b/debian/control index 73f4a8b..cb0ef34 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: collectd Section: utils Priority: optional Maintainer: Sebastian Harl -Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !ia64 !ppc64], nut-dev [!alpha !amd64 !ia64 !ppc64], libperl-dev +Build-Depends: debhelper (>= 5), po-debconf, dpatch, bison | byacc, flex, autotools-dev, libcurl3-gnutls-dev, libmysqlclient15-dev | libmysqlclient14-dev, librrd2-dev | librrd0-dev, libsensors-dev, liboping-dev (>= 0.3.3), libpcap0.8-dev | libpcap-dev, iptables-dev [!alpha !amd64 !hppa !ia64 !ppc64], nut-dev [!alpha !amd64 !hppa !ia64 !ppc64], libperl-dev Build-Conflicts: libpthread-dev Standards-Version: 3.7.2 XS-Vcs-Git: git://git.tokkee.org/pkg-collectd.git diff --git a/debian/rules b/debian/rules index 0f33ed9..e378398 100755 --- a/debian/rules +++ b/debian/rules @@ -33,7 +33,7 @@ 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). -ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 ia64 ppc64)) +ifneq (,$(findstring $(DEB_BUILD_ARCH),alpha amd64 hppa ia64 ppc64)) confflags += --disable-iptables --disable-nut endif -- 2.30.2