summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Hüttel <dilfridge@gentoo.org>2010-08-27 20:39:47 +0000
committerAndreas Hüttel <dilfridge@gentoo.org>2010-08-27 20:39:47 +0000
commitedfd6d85a51ee877f93286d42ea651e79e29e6f5 (patch)
tree029da6148200f40a67496cfde1ffa67aa6a2f24e /app-admin
parent[app-admin/collectd] Require iptables version where --as-needed linkage is fi... (diff)
downloadsunrise-edfd6d85a51ee877f93286d42ea651e79e29e6f5.tar.gz
sunrise-edfd6d85a51ee877f93286d42ea651e79e29e6f5.tar.bz2
sunrise-edfd6d85a51ee877f93286d42ea651e79e29e6f5.zip
[app-admin/collectd] Re-added (better) patch to correctly detect libiptc.
(Portage version: 2.1.8.3/svn/Linux x86_64) svn path=/sunrise/; revision=11250
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/collectd/ChangeLog5
-rw-r--r--app-admin/collectd/collectd-4.10.1-r1.ebuild2
-rw-r--r--app-admin/collectd/files/collectd-4.10.1-libiptc.patch12
3 files changed, 19 insertions, 0 deletions
diff --git a/app-admin/collectd/ChangeLog b/app-admin/collectd/ChangeLog
index 830e3e8c0..33fef6119 100644
--- a/app-admin/collectd/ChangeLog
+++ b/app-admin/collectd/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 27 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
+ collectd-4.10.1-r1.ebuild, +files/collectd-4.10.1-libiptc.patch:
+ And we still need a patch to correctly detect libiptc. It's a better one
+ now, though.
+
*collectd-4.10.1-r1 (26 Aug 2010)
26 Aug 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de>
diff --git a/app-admin/collectd/collectd-4.10.1-r1.ebuild b/app-admin/collectd/collectd-4.10.1-r1.ebuild
index 9453625f0..cccb68d6f 100644
--- a/app-admin/collectd/collectd-4.10.1-r1.ebuild
+++ b/app-admin/collectd/collectd-4.10.1-r1.ebuild
@@ -101,6 +101,8 @@ DEPEND="${COMMON_DEPEND}
RDEPEND="${COMMON_DEPEND}
cd_syslog? ( virtual/logger )"
+PATCHES=( "${FILESDIR}/${P}-libiptc.patch" )
+
collectd_plugin_kernel_linux() {
#
# USAGE: <plug-in name> <kernel_options> <severity>
diff --git a/app-admin/collectd/files/collectd-4.10.1-libiptc.patch b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
new file mode 100644
index 000000000..193a479eb
--- /dev/null
+++ b/app-admin/collectd/files/collectd-4.10.1-libiptc.patch
@@ -0,0 +1,12 @@
+diff -r -u collectd-4.10.1.orig/configure.in collectd-4.10.1/configure.in
+--- collectd-4.10.1.orig/configure.in 2010-07-09 12:01:59.000000000 +0200
++++ collectd-4.10.1/configure.in 2010-08-27 22:27:57.010271693 +0200
+@@ -1626,7 +1626,7 @@
+ # Check for the iptc_init symbol in the library.
+ if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno"
+ then
+- AC_CHECK_LIB(iptc, iptc_init,
++ AC_SEARCH_LIBS(iptc_init, [iptc ip4tc],
+ [
+ AC_DEFINE(HAVE_LIBIPTC, 1, [Define to 1 if you have the iptc library (-liptc).])
+ ],