diff mbox series

[11/15] collected: Fix build with glibc 2.36

Message ID 20220815171753.1858688-11-michael.tremer@ipfire.org
State Accepted
Commit 9060a9c9074d753bad930b9458af2155baaccd57
Headers
Series [01/15] sysvinit: Fix build against glibc 2.36 |

Commit Message

Michael Tremer Aug. 15, 2022, 5:17 p.m. UTC 
  Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/collectd                                        |  1 +
 src/patches/collectd-4.10.9-fix-glibc-headers.patch | 10 ++++++++++
 2 files changed, 11 insertions(+)
 create mode 100644 src/patches/collectd-4.10.9-fix-glibc-headers.patch
diff mbox series

Patch

diff --git a/lfs/collectd b/lfs/collectd
index bc508cb4a..5c4236b3a 100644
--- a/lfs/collectd
+++ b/lfs/collectd
@@ -108,6 +108,7 @@  $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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-drop-linux-disk-module.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-fix-glibc-headers.patch
 	cd $(DIR_APP) && autoupdate -v configure.in
 	cd $(DIR_APP) && autoreconf -vfi
 	cd $(DIR_APP)/libltdl && autoreconf -vfi
diff --git a/src/patches/collectd-4.10.9-fix-glibc-headers.patch b/src/patches/collectd-4.10.9-fix-glibc-headers.patch
new file mode 100644
index 000000000..fd05c4a59
--- /dev/null
+++ b/src/patches/collectd-4.10.9-fix-glibc-headers.patch
@@ -0,0 +1,10 @@ 
+--- collectd-4.10.9/src/utils_mount.c~	2022-08-10 13:45:39.424289940 +0000
++++ collectd-4.10.9/src/utils_mount.c	2022-08-10 13:45:58.224239495 +0000
+@@ -31,6 +31,7 @@
+ #include "plugin.h"
+ #include "utils_mount.h"
+ 
++#undef HAVE_XFS_XQM_H
+ #if HAVE_XFS_XQM_H
+ # include <xfs/xqm.h>
+ #define XFS_SUPER_MAGIC_STR "XFSB"