From c999e540dd233f8cb52eee4c35373cd6603aea97 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 29 Oct 2022 19:00:23 +0200 Subject: [PATCH] package/f2fs-tools: fix build with lz4 1.9.4 Fix the following build failure raised since bump of lz4 to version 1.9.4 in commit 1f54af8c4f814bfc0993756b82575ad581ce5318: compress.c: In function 'lz4_compress_init': compress.c:36:42: error: 'LZ4_STREAMSIZE_U64' undeclared (first use in this function); did you mean 'LZ4_STREAMSIZE'? 36 | #define LZ4_STREAMSIZE (LZ4_STREAMSIZE_U64 * sizeof(long long)) | ^~~~~~~~~~~~~~~~~~ Fixes: - http://autobuild.buildroot.org/results/ca8b6646322a4cb911fad5fb9cb38046743609bf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...s-tools-fix-build-error-on-lz4-1-9-4.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch diff --git a/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch b/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch new file mode 100644 index 0000000000..b43def6bb7 --- /dev/null +++ b/package/f2fs-tools/0002-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch @@ -0,0 +1,34 @@ +From 19f77c6f6277a274434d6d8883f50e7955c6a8db Mon Sep 17 00:00:00 2001 +From: Jaegeuk Kim +Date: Mon, 29 Aug 2022 11:03:35 -0700 +Subject: f2fs-tools: fix build error on lz4-1.9.4 + +LZ4_STREAMSIZE_U64 is undefined in new lz4 lib. + +Signed-off-by: Jaegeuk Kim +[Retrieved from: +https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs-tools.git/commit/?id=19f77c6f6277a274434d6d8883f50e7955c6a8db] +Signed-off-by: Fabrice Fontaine +--- + fsck/compress.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) + +diff --git a/fsck/compress.c b/fsck/compress.c +index b413492..b15f0a4 100644 +--- a/fsck/compress.c ++++ b/fsck/compress.c +@@ -32,10 +32,7 @@ + #ifdef HAVE_LIBLZ4 + #define LZ4_MEMORY_USAGE 14 + #define LZ4_MAX_INPUT_SIZE 0x7E000000 /* 2 113 929 216 bytes */ +-#ifndef LZ4_STREAMSIZE +-#define LZ4_STREAMSIZE (LZ4_STREAMSIZE_U64 * sizeof(long long)) +-#endif +-#define LZ4_MEM_COMPRESS LZ4_STREAMSIZE ++#define LZ4_MEM_COMPRESS sizeof(LZ4_stream_t) + #define LZ4_ACCELERATION_DEFAULT 1 + #define LZ4_WORK_SIZE ALIGN_UP(LZ4_MEM_COMPRESS, 8) + #endif +-- +cgit +