From 0e932eb6b5fa836a8d2ab66caced592503ddd2fd Mon Sep 17 00:00:00 2001 From: Florian Larysch Date: Mon, 12 May 2025 14:02:23 +0200 Subject: [PATCH] package/f2fs-tools: fix GCC 15 build f2fs-tools had its own "bool" typedef which now conflicts with the C23 keyword, causing build failures on GCC 15. Import a patch from upstream that fixes this. Fixes: https://autobuild.buildroot.org/results/d17641582d1beaec9dcca4dc48a68d713cecfdc8 (and others) Signed-off-by: Florian Larysch Signed-off-by: Julien Olivain (cherry picked from commit 598dfb7c1a10acad39d6d6aa943f3524f8dfbd3b) Signed-off-by: Thomas Perale --- ...-tools-use-stdbool.h-instead-of-bool.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch diff --git a/package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch b/package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch new file mode 100644 index 0000000000..90dfdc209a --- /dev/null +++ b/package/f2fs-tools/0002-f2fs-tools-use-stdbool.h-instead-of-bool.patch @@ -0,0 +1,41 @@ +From ec0f9d07792298f89e71cee1e692ad60bf6b8d5c Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Thu, 24 Oct 2024 20:33:38 +0000 +Subject: [PATCH] f2fs-tools: use stdbool.h instead of bool + +The existing bool definition is broken for c23, where bool is now a keyword. + +Signed-off-by: Elliott Hughes +Signed-off-by: Jaegeuk Kim +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=6617d15a660becc23825007ab3fc2d270b5b250f +[Florian: rebased to 1.16.0] +Signed-off-by: Florian Larysch +--- + include/f2fs_fs.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h +index f890634..a968380 100644 +--- a/include/f2fs_fs.h ++++ b/include/f2fs_fs.h +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #ifdef HAVE_CONFIG_H + #include +@@ -103,9 +104,6 @@ typedef uint16_t u16; + typedef uint8_t u8; + typedef u32 block_t; + typedef u32 nid_t; +-#ifndef bool +-typedef u8 bool; +-#endif + typedef unsigned long pgoff_t; + typedef unsigned short umode_t; + +-- +2.49.0 +