From 8d4da55a5d09e9f71e1845b31e8b8ac3979e8f77 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 23 Oct 2018 16:45:33 +0100 Subject: [PATCH] collectd: Fix compiling against newer xfsprogs Signed-off-by: Michael Tremer --- config/rootfiles/core/125/filelists/collectd | 1 + lfs/collectd | 3 ++ .../collectd-4.10.9-xfs-compile-fix.patch | 28 +++++++++++++++++++ 3 files changed, 32 insertions(+) create mode 120000 config/rootfiles/core/125/filelists/collectd create mode 100644 src/patches/collectd-4.10.9-xfs-compile-fix.patch diff --git a/config/rootfiles/core/125/filelists/collectd b/config/rootfiles/core/125/filelists/collectd new file mode 120000 index 0000000000..871b32f14b --- /dev/null +++ b/config/rootfiles/core/125/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/lfs/collectd b/lfs/collectd index fd5dd946a2..9592ec95a3 100644 --- a/lfs/collectd +++ b/lfs/collectd @@ -104,6 +104,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && patch -p1 -i $(DIR_SRC)/src/patches/collectd/0021-openvpn-Fix-copy-and-paste-error.patch 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) && autoreconf -vfi + cd $(DIR_APP)/libltdl && autoreconf -vfi cd $(DIR_APP) && ./configure --prefix=/usr --localstatedir=/var \ --disable-{apple_sensors,csv,ipvs,mbmon,memcached,mysql} \ --disable-{netlink,nginx,nut,perl,serial,snmp,tape,vserver,xmms} \ diff --git a/src/patches/collectd-4.10.9-xfs-compile-fix.patch b/src/patches/collectd-4.10.9-xfs-compile-fix.patch new file mode 100644 index 0000000000..f622104a71 --- /dev/null +++ b/src/patches/collectd-4.10.9-xfs-compile-fix.patch @@ -0,0 +1,28 @@ +--- collectd-4.10.9/src/utils_mount.c~ 2018-10-23 12:16:24.979393842 +0000 ++++ collectd-4.10.9/src/utils_mount.c 2018-10-23 12:18:44.473984419 +0000 +@@ -21,20 +21,22 @@ + * Niki W. Waibel + **/ + ++#define _GNU_SOURCE ++ + #if HAVE_CONFIG_H + # include "config.h" + #endif + + #include "common.h" ++#include "plugin.h" ++#include "utils_mount.h" ++ + #if HAVE_XFS_XQM_H + # include + #define XFS_SUPER_MAGIC_STR "XFSB" + #define XFS_SUPER_MAGIC2_STR "BSFX" + #endif + +-#include "plugin.h" +-#include "utils_mount.h" +- + #if HAVE_GETVFSSTAT + # if HAVE_SYS_TYPES_H + # include -- 2.39.2