From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2F6A3C433FE for ; Tue, 8 Nov 2022 20:27:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id BE27581CAF; Tue, 8 Nov 2022 20:27:48 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org BE27581CAF X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5_dybOr76bD4; Tue, 8 Nov 2022 20:27:46 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id CCC6581DF1; Tue, 8 Nov 2022 20:27:45 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org CCC6581DF1 Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9258E1BF95C for ; Tue, 8 Nov 2022 20:27:18 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 6DCD741559 for ; Tue, 8 Nov 2022 20:27:18 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 6DCD741559 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ulkYp0XCrsud for ; Tue, 8 Nov 2022 20:27:17 +0000 (UTC) Received: from busybox.osuosl.org (busybox.osuosl.org [140.211.167.122]) by smtp4.osuosl.org (Postfix) with ESMTP id 61F4F409A5 for ; Tue, 8 Nov 2022 20:27:17 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 61F4F409A5 Received: by busybox.osuosl.org (Postfix, from userid 4053) id 4DF54811C4; Tue, 8 Nov 2022 20:27:17 +0000 (UTC) From: Peter Korsgaard To: buildroot@buildroot.org Date: Tue, 8 Nov 2022 21:16:58 +0100 X-Git-Refname: refs/heads/2022.02.x X-Git-Oldrev: dcad3b2d601741321fd9d9c8f0f02fc09db8f12e X-Git-Newrev: 9c38bc7befbe0f5568865441a64ed8914a6b4606 X-Patchwork-Hint: ignore Message-Id: <20221108202717.4DF54811C4@busybox.osuosl.org> Subject: [Buildroot] [git commit branch/2022.02.x] package/f2fs-tools: fix build with lz4 1.9.4 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" commit: https://git.buildroot.net/buildroot/commit/?id=9c38bc7befbe0f5568865441a64ed8914a6b4606 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/2022.02.x 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 (cherry picked from commit c999e540dd233f8cb52eee4c35373cd6603aea97) Signed-off-by: Peter Korsgaard --- ...2-f2fs-tools-fix-build-error-on-lz4-1-9-4.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) 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 + _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot