From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] collectd: Link against libip4tc
Date: Thu, 10 Sep 2020 20:39:06 +0000 [thread overview]
Message-ID: <20200910203906.14234-1-michael.tremer@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1861 bytes --]
libiptc is no longer being shipped by iptables and has been split
into a version for IPv4 and IPv6.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
lfs/collectd | 1 +
src/patches/collectd-4.10-libiptc-build-fixes.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 src/patches/collectd-4.10-libiptc-build-fixes.patch
diff --git a/lfs/collectd b/lfs/collectd
index e3fcc1013..0f99c4ce7 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -105,6 +105,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0022-openvpn-Change-data-type-from-COUNTER-to-DERIVE.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/silence-openvpn-errors.patch
cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10.9-xfs-compile-fix.patch
+ cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd-4.10-libiptc-build-fixes.patch
cd $(DIR_APP) && autoreconf -vfi
cd $(DIR_APP)/libltdl && autoreconf -vfi
cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
diff --git a/src/patches/collectd-4.10-libiptc-build-fixes.patch b/src/patches/collectd-4.10-libiptc-build-fixes.patch
new file mode 100644
index 000000000..851dba70f
--- /dev/null
+++ b/src/patches/collectd-4.10-libiptc-build-fixes.patch
@@ -0,0 +1,11 @@
+--- collectd-4.10.9/src/Makefile.am~ 2020-09-10 19:45:41.936847854 +0000
++++ collectd-4.10.9/src/Makefile.am 2020-09-10 19:45:50.416713658 +0000
+@@ -418,7 +418,7 @@
+ iptables_la_LIBADD = owniptc/libiptc.la
+ iptables_la_DEPENDENCIES = owniptc/libiptc.la
+ else
+-iptables_la_LIBADD = -liptc
++iptables_la_LIBADD = -lip4tc
+ endif
+ collectd_LDADD += "-dlopen" iptables.la
+ collectd_DEPENDENCIES += iptables.la
--
2.20.1
reply other threads:[~2020-09-10 20:39 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200910203906.14234-1-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox