fireinfo: Update to 2.2.0

[people/pmueller/ipfire-2.x.git] / lfs / collectd

diff --git a/lfs/collectd b/lfs/collectd
index 9592ec95a3572c622751764749f2f0fa2741e700..5e96ddbb38f9cc9c55863fb1fa33dddb9e04f0d9 100644 (file)
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -34,9 +34,9 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = collectd
 
-DEPS       = ""
+DEPS       =
 
-CFLAGS    += -Wno-error=deprecated-declarations
+CFLAGS    += -fcommon -Wno-error=deprecated-declarations
 
 ###############################################################################
 # Top-level Rules
@@ -105,6 +105,10 @@ $(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) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-remove-checks-for-SENSORS_API_VERSION-upper-limit.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10-disk-plugin-fields.patch
+       cd $(DIR_APP) && autoupdate -v configure.in
        cd $(DIR_APP) && autoreconf -vfi
        cd $(DIR_APP)/libltdl && autoreconf -vfi
        cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \
@@ -115,8 +119,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                --enable-{interface,iptables,irq,load,logfile,memory,multimeter} \
                --enable-{network,nfs,ntpd,ping,processes,rrdtool,sensors,swap,syslog} \
                --enable-{tcpconns,unixsock,users,wireless} \
-               --with-librrd=/usr/share/rrdtool-1.2.30
-       cd $(DIR_APP) && make install
+               --with-librrd=/usr/share/rrdtool-1.2.30 \
+               --with-fp-layout=nothing
+       cd $(DIR_APP) && make install #collectd-4 does not support parallel build
        cp -vf $(DIR_SRC)/config/collectd/collectd.* /etc/
        mv /etc/collectd.vpn /var/ipfire/ovpn/collectd.vpn
        chown nobody.nobody /var/ipfire/ovpn/collectd.vpn