From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B7A6E1581F3 for ; Sun, 1 Dec 2024 14:56:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15B58E07F1; Sun, 1 Dec 2024 14:56:30 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B954E07F1 for ; Sun, 1 Dec 2024 14:56:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 89D3B34133B for ; Sun, 1 Dec 2024 14:56:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E3A51F96 for ; Sun, 1 Dec 2024 14:56:26 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1733064948.0b8d6bb128bdc0d4a73c5d69226d29f9bf20701b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/e2fsprogs/, sys-fs/e2fsprogs/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch X-VCS-Directories: sys-fs/e2fsprogs/files/ sys-fs/e2fsprogs/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0b8d6bb128bdc0d4a73c5d69226d29f9bf20701b X-VCS-Branch: master Date: Sun, 1 Dec 2024 14:56:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f848e9e-2ac6-4a05-89c2-9e83151d1360 X-Archives-Hash: 981bc22bf5fc83360fd18cc8ec159356 commit: 0b8d6bb128bdc0d4a73c5d69226d29f9bf20701b Author: Sam James gentoo org> AuthorDate: Sun Dec 1 14:42:42 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Dec 1 14:55:48 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b8d6bb1 sys-fs/e2fsprogs: fix C23 compat Closes: https://bugs.gentoo.org/943687 Signed-off-by: Sam James gentoo.org> sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 1 + sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch | 38 +++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild index 216ac564dcfe..d1f1284271fc 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild @@ -46,6 +46,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch # Upstream patches (can usually removed with next version bump) + "${FILESDIR}"/${PN}-1.47.1-c23.patch ) src_prepare() { diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch new file mode 100644 index 000000000000..b39e0a45534c --- /dev/null +++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.1-c23.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/943687 +https://github.com/tytso/e2fsprogs/issues/202 +https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef + +From 49fd04d77b3244c6c6990be41142168eef373aef Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Fri, 22 Nov 2024 12:36:32 +0000 +Subject: [PATCH] libext2fs: fix -std=c23 build failure + +gcc-15 switched to -std=c23 by default: + + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212 + +As a result `e2fsprogs` fails the build so only typedef int bool +for __STDC_VERSION__ <= 201710L (C17) + + ../../../lib/ext2fs/tdb.c:113:13: error: two or more data types in declaration specifiers + ../../../lib/ext2fs/tdb.c:113:1: warning: useless type name in empty declaration + 113 | typedef int bool; + | ^~~~~~~ + +https://github.com/tytso/e2fsprogs/issues/202 + +Signed-off-by: Rudi Heitbaum +Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da +Signed-off-by: Theodore Ts'o +--- a/lib/ext2fs/tdb.c ++++ b/lib/ext2fs/tdb.c +@@ -110,7 +110,9 @@ static char *rep_strdup(const char *s) + #endif + #endif + ++#if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L + typedef int bool; ++#endif + + #include "tdb.h" +