mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
e2fsprogs: Fix build failure with gcc 15
Backport a needed fix (From OE-Core rev: baceb28924383729a445e2bf2a13c0a6115bc5c7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
+42
@@ -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"
|
||||
|
||||
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user