]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
f2fs-tools: fix building with GCC 15.1 18991/head
authorJohn Audia <therealgraysky@proton.me>
Sun, 1 Jun 2025 11:16:04 +0000 (07:16 -0400)
committerRobert Marko <robimarko@gmail.com>
Sun, 8 Jun 2025 10:41:15 +0000 (12:41 +0200)
Add a patch in order to fix it.

Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/18991
Signed-off-by: Robert Marko <robimarko@gmail.com>
package/utils/f2fs-tools/Makefile
package/utils/f2fs-tools/patches/100-f2fs-tools-use-stdbool.h-instead-of-bool.patch [new file with mode: 0644]

index d11e89d8e3cee2e0907cbe5585e3ed1d2bb00fec..7a1c2dbcfbd2a01de4920168f27fc4c37ab1bfb5 100644 (file)
@@ -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 (file)
index 0000000..fc3d800
--- /dev/null
@@ -0,0 +1,33 @@
+From 6617d15a660becc23825007ab3fc2d270b5b250f Mon Sep 17 00:00:00 2001
+From: Jaegeuk Kim <jaegeuk@kernel.org>
+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 <enh@google.com>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+---
+ 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 <stddef.h>
+ #include <string.h>
+ #include <time.h>
++#include <stdbool.h>
+ #ifdef HAVE_CONFIG_H
+ #include <config.h>
+@@ -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;