webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-19 23:43:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

collectd: Link against libip4tc

Browse Source 
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@ipfire.org>
This commit is contained in:
Michael Tremer
2020-09-10 20:39:06 +00:00
parent 35272cd5bc
commit b171c68349
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lfs/collectd
View File

@@ -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 \

11
src/patches/collectd-4.10-libiptc-build-fixes.patch Normal file
View File

@@ -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