From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 11/15] collected: Fix build with glibc 2.36 Date: Mon, 15 Aug 2022 17:17:49 +0000 Message-ID: <20220815171753.1858688-11-michael.tremer@ipfire.org> In-Reply-To: <20220815171753.1858688-1-michael.tremer@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2365538458752437054==" List-Id: --===============2365538458752437054== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Signed-off-by: Michael Tremer --- 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 --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-lin= ux-disk-module.patch + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/collectd-4.10.9-fix-gl= ibc-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/patche= s/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" +=20 ++#undef HAVE_XFS_XQM_H + #if HAVE_XFS_XQM_H + # include + #define XFS_SUPER_MAGIC_STR "XFSB" --=20 2.30.2 --===============2365538458752437054==--