From patchwork Mon Aug 15 17:17:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 5874 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4M61FZ2Zh5z3wfW for ; Mon, 15 Aug 2022 17:18:10 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4M61FS2Rhmz5Y9; Mon, 15 Aug 2022 17:18:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4M61FS18DVz30HJ; Mon, 15 Aug 2022 17:18:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4M61FP4hKyz302W for ; Mon, 15 Aug 2022 17:18:01 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4M61FM62YFz5XV; Mon, 15 Aug 2022 17:17:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1660583879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qbjH5iz9LOLxMpcsR9BTv6SvJCm4jle5EK1BEgSbthY=; b=jp3piFSY7fxvb19E97bHlQZXlw3WWy/YLDvV9BnpQkQZ8uDMyZZHylb5eMJGL8lvkHC35b QQxyD+IEdn0JoHOlzV51jtuq+4QQpIWgdzb0rjx+zYpxXJbSuX/9miBA0lZB9O3YEI4ITh 8dbVvjDhMnywE+QKnA0et+vHYCxamRz5iGASRp/az46wM7lo1bTFnC0BgUqZdOO60UlLm8 zF5V1Onvq2cQIMRWY4i/zfX7TB23+o5Re3y1KQdDUG9uUI9LXGr80wzHH6ObsOeQoqO7W1 WZwM5k+LoYTogUHKzgewOHSFo5S6wihcgC7TKuzMesz1DycNuVvfPrqQ+5fLQw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1660583880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qbjH5iz9LOLxMpcsR9BTv6SvJCm4jle5EK1BEgSbthY=; b=w7kNRVKWrxpk3qyBQSzYQ7Gq3p749m2ZER5Poi2FkiTMwBErwFf5DQyOXECKELiV8B21G9 n41YHqLemoEfG3AQ== 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> References: <20220815171753.1858688-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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-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 + #define XFS_SUPER_MAGIC_STR "XFSB"