From f831b9d9672b0cb10955eacac51d910f0b8befad Mon Sep 17 00:00:00 2001 From: John Audia Date: Sun, 1 Jun 2025 07:16:04 -0400 Subject: [PATCH] f2fs-tools: fix building with GCC 15.1 Add a patch in order to fix it. Signed-off-by: John Audia Link: https://github.com/openwrt/openwrt/pull/18991 Signed-off-by: Robert Marko --- package/utils/f2fs-tools/Makefile | 2 +- ...-tools-use-stdbool.h-instead-of-bool.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 package/utils/f2fs-tools/patches/100-f2fs-tools-use-stdbool.h-instead-of-bool.patch diff --git a/package/utils/f2fs-tools/Makefile b/package/utils/f2fs-tools/Makefile index d11e89d8e3c..7a1c2dbcfbd 100644 --- a/package/utils/f2fs-tools/Makefile +++ b/package/utils/f2fs-tools/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=f2fs-tools PKG_VERSION:=1.16.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/snapshot/ diff --git a/package/utils/f2fs-tools/patches/100-f2fs-tools-use-stdbool.h-instead-of-bool.patch b/package/utils/f2fs-tools/patches/100-f2fs-tools-use-stdbool.h-instead-of-bool.patch new file mode 100644 index 00000000000..fc3d8009aa0 --- /dev/null +++ b/package/utils/f2fs-tools/patches/100-f2fs-tools-use-stdbool.h-instead-of-bool.patch @@ -0,0 +1,33 @@ +From 6617d15a660becc23825007ab3fc2d270b5b250f 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 +--- + include/f2fs_fs.h | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +--- 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.47.2