[v3,11/27] e2fsprogs: Fix build failure with gcc 15

Message ID	20250319081610.3536475-11-raj.khem@gmail.com
State	Accepted, archived
Commit	baceb28924383729a445e2bf2a13c0a6115bc5c7
Headers	show Return-Path: <raj.khem@gmail.com> ip: 209.85.214.181, mailfrom: raj.khem@gmail.com) From: Khem Raj <raj.khem@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Khem Raj <raj.khem@gmail.com> Subject: [PATCH v3 11/27] e2fsprogs: Fix build failure with gcc 15 Date: Wed, 19 Mar 2025 01:15:39 -0700 Message-ID: <20250319081610.3536475-11-raj.khem@gmail.com> In-Reply-To: <20250319081610.3536475-1-raj.khem@gmail.com> References: <20250319081610.3536475-1-raj.khem@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	[v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 \| expand [v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 [v3,02/27] webkitgtk: Fix build with clang-20 [v3,03/27] webkitgtk: Fix assertion options with clang [v3,04/27] libpam: add ptest cases back [v3,05/27] gdbm: Use C11 standard [v3,06/27] bluez: Fix build with GCC-15 [v3,07/27] readline: Fixed build with GCC-15 [v3,08/27] bash: Stick to C17 std [v3,09/27] tcp-wrappers: Stick to C17 standard [v3,10/27] libsndfile1: Include <stdbool.h> instead of redefining bool true and false [v3,11/27] e2fsprogs: Fix build failure with gcc 15 [v3,12/27] dbus-glib: Fix build with GCC 15 [v3,13/27] libmatchbox: Fix build with gcc-15 [[PATCH,v2,14/25] libmatchbox: Fix build with gcc-15 [[PATCH,v2,15/25] ppp: Fix build when shadow is enabled [[PATCH,v2,16/25] unzip: Fix build with GCC-15 [v3,17/27] cpio: Pin to use C17 std [v3,18/27] expect: Fix build with GCC 15 [[PATCH,v2,19/25] expect: Fix build with GCC 15 [[PATCH,v2,20/25] cronie: Resolve build failure with GCC15 [v3,21/27] psplash: Fix build with GCC 15 [[PATCH,v2,22/25] psplash: Fix build with GCC 15 [[PATCH,v2,23/25] at: Remove mktime signature from posixtm.c [[PATCH,v2,24/25] time: Fix build with musl [v3,25/27] oeqa: Build cpio with C17 std [v3,26/27] man-db: Add missing rdep for col utility [v3,27/27] man-db: Fix musl build with NLS

Message ID

20250319081610.3536475-11-raj.khem@gmail.com

State

Accepted, archived

Commit

baceb28924383729a445e2bf2a13c0a6115bc5c7

Headers

From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>
Subject: [PATCH v3 11/27] e2fsprogs: Fix build failure with gcc 15
Date: Wed, 19 Mar 2025 01:15:39 -0700
Message-ID: <20250319081610.3536475-11-raj.khem@gmail.com>
In-Reply-To: <20250319081610.3536475-1-raj.khem@gmail.com>
References: <20250319081610.3536475-1-raj.khem@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

[v3,01/27] webkitgtk: 2.46.6 -> 2.48.0 | expand

Commit Message

Khem Raj March 19, 2025, 8:15 a.m. UTC

Backport a needed fix

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 ...-libext2fs-fix-std-c23-build-failure.patch | 42 +++++++++++++++++++
 .../e2fsprogs/e2fsprogs_1.47.1.bb             |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch
new file mode 100644
index 00000000000..01ab9d5afb5
--- /dev/null
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/0001-libext2fs-fix-std-c23-build-failure.patch
@@ -0,0 +1,42 @@ 
+From 72dcef02bee9924c4d5b3dc6e7ef4d07becebcc6 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+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
+
+Upstream-Status: Backport [https://github.com/tytso/e2fsprogs/commit/49fd04d77b3244c6c6990be41142168eef373aef]
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+Link: https://lore.kernel.org/r/Z0B60JhdvT9bpSQ6@6f91903e89da
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ lib/ext2fs/tdb.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/ext2fs/tdb.c b/lib/ext2fs/tdb.c
+index b07b2917..98dc95d8 100644
+--- 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"
+ 
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb
index bd6ac92cb14..022b016f123 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.47.1.bb
@@ -4,6 +4,7 @@  SRC_URI += "file://remove.ldconfig.call.patch \
            file://run-ptest \
            file://ptest.patch \
            file://mkdir_p.patch \
+           file://0001-libext2fs-fix-std-c23-build-failure.patch \
            "
 SRC_URI:append:class-native = " \
            file://e2fsprogs-fix-missing-check-for-permission-denied.patch \

[v3,11/27] e2fsprogs: Fix build failure with gcc 15

Commit Message

Patch