From patchwork Wed Jul 3 09:06:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3158 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 2527C3F0E0 for ; Wed, 3 Jul 2024 11:06:39 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-584ef6c00c0sf708363a12.1 for ; Wed, 03 Jul 2024 02:06:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1719997599; cv=pass; d=google.com; s=arc-20160816; b=hAwbA/yIPX4btn5csg06fHu5iLPYAXivJad3S8VqXNRdfoRxnoOP2FCFgU68D9Uk22 6AFxodtxcRZZQkqGl68THoQhL9Peetn19P+oYmg9qTlD7PD9JO0qX5d2cIXm+IspI7uf ztbzqlV7hinRiaWhpLsbqk8NFPurQdXc0UvxInMdLAXGflFFxx7xZTA3gRwPdSfBj2Jz anS3gsK+PcI3wD3qtGvwR4k/2/hnVPToM+j/1ISJ7UeBov8NDM56VQn6JTUQw/1wWtlP hFs2Kj2Pn3SjLEzHZwlStmWI/h1Qqfjb+vRYgBG8tCPelVEmEao8WZiji5R+VD0F05TT zNNg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=+3F4r3Mz5MAnGP8jyU9sbEXHQ6OM7OkJJsq9XEHyYGI=; fh=PSZVZX32Z+UjxwYe804GRWcsW8dl75Rx+tMa5BjQPvM=; b=q1wgCxklZLD/qiXrmXuGnTR5ftIiiApEc3JiiwOIqy0bEZ7uE73nIM2Xcs/xKfNMdZ OfgHNNyrKPUIB3FI2IE/5wS7SRfJQhzkWWGAFIC6+bLb3UWVIfYE1h26l2Cc5gDCAyiK nkzpXcYmrNA3IzbhMcH5lKIX6kS3+XtGKPsoxJYk16mc6oIH6ujjzUp2T2CThhc5J8Aw GM+B4+q57JuQLhPNyt0xEfF7v1e11A/YGcKRz0aga/7YslOJux3wPdNeZ/mQzIRqg5WE +SjPNfSkWrMRALeR7dxE/tU2fT3viGMPBCIP0W00USirGP7DcNEe8JIDx2rrAIycJgaR WQqA==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=EzbdJcSg; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1719997599; x=1720602399; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=+3F4r3Mz5MAnGP8jyU9sbEXHQ6OM7OkJJsq9XEHyYGI=; b=SiYnOjOj2gJ+osnksB5MtCuETSn6ns5mOoUAygowlg2jmyNp5ltbCf3jKEyN/t9Kqg BSGUE1LChtZt/QFaKTS5ufoTYnpDjRLLhMUlpWqhUGRQtzOLDiWAkTk7yQZ23I+pRj+7 8HKpjYmPE9FiXipCkRY1HBSzTwiaUkVn6Fptc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719997599; x=1720602399; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=+3F4r3Mz5MAnGP8jyU9sbEXHQ6OM7OkJJsq9XEHyYGI=; b=Ee4pqqjNXf7eNuz1f0oaIAZ+iasaxBhgxPFsIOy5TUGV62Ic9D1DyEbj7Q/kTqKkQ1 +LvvxLVo4wMDXNusZfsgdESH+zihpjvO3/uIfY8pv/DAl62fAk+zUcxwbjInt+nVc5LL 03kUbo7lKKWwh/2loGal/qGUpaGcgT7wjWIdjALc9MUPKevSHSrJ4MpDsEnWeH+0tw+T PCMlfAFiwFUchUeWZ9WpG3GYR2D/UK/bL1pblllm1Af4AooLtly8TUd4Itm5db/+3Nf0 MuGbs5QJ+uqzGKZiWM+gPSXjpY2bBE2s28ySaW3H3sZpgu/AFdNS82AlU7lOxaZT+Gpz W0bQ== X-Forwarded-Encrypted: i=2; AJvYcCVoHnIe6uEmwSke7JUI9PMW64/tollhUZbauakdpOb0oxpgQTYXmeEd5eWLSEvgY/Zrq/PddMpWFsfM4U/W7lcd8BQSZjjiMpQZIzG2ZuuYNdrtidxQvKoDYXdpSQ== X-Gm-Message-State: AOJu0Yw2IiI8BCNjR3gmNMeZCFvNpbqSD961MSJDB8L9UePdsWLFyuRd 4y3pw4XhkDWjYwd5TsghnlLp+HtngbOHC8dOXqPm5IKkV4m2zwX+bGM8zjcaXtvBRA== X-Google-Smtp-Source: AGHT+IFX3nFLO99vBacmxf1C13JXciLkhe8qco+5Et0D2bhhLMZV6xK2baOJD+dqxwQLX1B6cmwZfQ== X-Received: by 2002:a05:6402:34d3:b0:57d:4692:ba54 with SMTP id 4fb4d7f45d1cf-58ce4c9b35emr765165a12.6.1719997598687; Wed, 03 Jul 2024 02:06:38 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:b90:b0:58b:d414:30d1 with SMTP id 4fb4d7f45d1cf-58bd41431b0ls1038077a12.0.-pod-prod-00-eu; Wed, 03 Jul 2024 02:06:37 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXX9te9+UEmWo4hqLrFNGOj3Udkt09mffq4FBFSDJWDLY2YUxx13XWKcqs/MeF1kN6MVmVGjlZkB7qP9K2tg/XMoGwsYu6pOPmw1vOwQaTB52AI X-Received: by 2002:a17:907:170f:b0:a6f:e03a:99d with SMTP id a640c23a62f3a-a77a229f152mr92315366b.0.1719997597099; Wed, 03 Jul 2024 02:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719997597; cv=none; d=google.com; s=arc-20160816; b=iX1RJOcruhGBg00CfTQcBQ66Y7tO6O80vW5T//jxpu3t9k8HDiheqqB9+Y/8MdPe/p awfWXWJSvebWJEVKyuZU7liXBW4QHQYYGztODnU6yh81Wx+Fo9ZDL4FAr1TWWILuXtkL dPw4U1sDFOPr2WjkOxiZ+3OilsqSeaDNYuSRXnEJmqfYvN5KuDUMvUH22+GTFcq0G2an kA8W8XDS+DA0oQGlHp2XqE9y23K4Z2iNzgJtPZdQa97f1+NaYzdra5ZNW7Z0o4hhhQ4p +WoV84YOOesQjgyAPTJAAwdFL9lvCtqkhZMn815T7viLGc+oOO9bNZCfkwoqFQMqBzBK kmlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=aYe+YnF0EUGwo+FxY3ktukvaYJAaRug7LiydQnjYwUo=; fh=ObddCgPQmknY26kdIZc2XvZJo1h/DJWA8USSrUANHRo=; b=wS1tsdH2VNkpSWpGqswawWsL1df0VW/lB5XZPRs4nOQWSSL4R7fU751/3FemSEOQX1 b0hLTAayOiWoVMj/cfzLRBnzWzJhLVQigwabpjIZtqd8qf0aiop+OzEwZClVTDelbVs0 dOUGKj41pMg4qufWmNhxmPk/H3J4ZDLMIrbQpn66Sg8qHAq3SDllYhpezg+E4INmTicm +NXM/DgDOBW5lEn1Ba2oPk0fxD3VRIHEyGYgeGQACeDVj0kj7luXhk2Ftl6DS2xPU+Ki a06w4VLHJqKWz4J26yErtDZzUzkVn4yr8qSR2DocclpGDBKHWdVIce9StEjJYm3x2ISq goWQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=EzbdJcSg; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-a729cd21734sor544272066b.8.2024.07.03.02.06.37 for (Google Transport Security); Wed, 03 Jul 2024 02:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCVqHe+iWxEEIgSv54iV/MBnTte27h+zyVcpfc7bAg79/i7Ya1+sTwEFj8izS17XOeaeZB6/53iSDtAEi5W7Z9NMi7yBCbPcoS3HPY1H2esJR6rs X-Received: by 2002:a17:906:2750:b0:a72:7a71:7f4f with SMTP id a640c23a62f3a-a77a2411db7mr81403666b.7.1719997596624; Wed, 03 Jul 2024 02:06:36 -0700 (PDT) Received: from localhost.localdomain ([2001:b07:6474:ebbf:1a37:2bf3:7cf8:1941]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72aaf1ba9dsm489379766b.29.2024.07.03.02.06.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jul 2024 02:06:36 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Steve James , linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/leveldb: update the patches to be applied with fuzz 0 Date: Wed, 3 Jul 2024 11:06:30 +0200 Message-ID: <20240703090630.2657626-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=EzbdJcSg; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, leveldb fails to build with output: Applying 0002-CMake-install-libmemenv.a.patch using patch: patching file CMakeLists.txt Hunk #1 succeeded at 209 (offset 22 lines). Hunk #2 succeeded at 469 (offset 27 lines). Hunk #3 FAILED at 495. 1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej Applying 0004-cmake-Use-find_package-to-find-Snappy.patch using patch: patching file CMakeLists.txt Hunk #2 FAILED at 34. Hunk #3 succeeded at 301 (offset 22 lines). 1 out of 3 hunks FAILED -- saving rejects to file CMakeLists.txt.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi --- .../0002-CMake-install-libmemenv.a.patch | 24 ++++++++++--------- ...make-Use-find_package-to-find-Snappy.patch | 18 +++++++------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/package/leveldb/0002-CMake-install-libmemenv.a.patch b/package/leveldb/0002-CMake-install-libmemenv.a.patch index ea742b0c4977..25e050eaff8d 100644 --- a/package/leveldb/0002-CMake-install-libmemenv.a.patch +++ b/package/leveldb/0002-CMake-install-libmemenv.a.patch @@ -1,4 +1,4 @@ -From 2fa960098e5b6f9daa9f7d6cab27188566859be8 Mon Sep 17 00:00:00 2001 +From ef03beb64f5e8028f6b5d65f75ee60e8b2eec594 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sat, 12 Oct 2019 14:43:46 +0200 Subject: [PATCH] CMake: install libmemenv.a @@ -10,15 +10,17 @@ https://git.busybox.net/buildroot/commit/?id=16f847340d07dce620e4c3fc0a099aa7989 Signed-off-by: Bernd Kuhls [Fabrice : updated for 1.23] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - CMakeLists.txt | 26 +++++++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) + CMakeLists.txt | 32 +++++++++++++++++++++++++++++++- + 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a65afbf..83b2425 100644 +index f8285b82c6a4..ffce93b01ed6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -187,6 +187,30 @@ target_sources(leveldb +@@ -209,6 +209,30 @@ target_sources(leveldb "${LEVELDB_PUBLIC_INCLUDE_DIR}/write_batch.h" ) @@ -49,7 +51,7 @@ index a65afbf..83b2425 100644 if (WIN32) target_sources(leveldb PRIVATE -@@ -418,7 +436,7 @@ endif(LEVELDB_BUILD_BENCHMARKS) +@@ -445,7 +469,7 @@ int main() { endif(LEVELDB_BUILD_BENCHMARKS) if(LEVELDB_INSTALL) @@ -58,8 +60,8 @@ index a65afbf..83b2425 100644 EXPORT leveldbTargets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -@@ -444,6 +462,12 @@ if(LEVELDB_INSTALL) - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/leveldb +@@ -471,6 +495,12 @@ if(LEVELDB_INSTALL) + DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/leveldb" ) + install( @@ -69,8 +71,8 @@ index a65afbf..83b2425 100644 + ) + include(CMakePackageConfigHelpers) - write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/leveldbConfigVersion.cmake" + configure_package_config_file( + "cmake/${PROJECT_NAME}Config.cmake.in" -- -2.20.1 +2.43.0 diff --git a/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch b/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch index 714e1b082740..e254a26b9afb 100644 --- a/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch +++ b/package/leveldb/0004-cmake-Use-find_package-to-find-Snappy.patch @@ -1,4 +1,4 @@ -From 450c1d88b3e1af34614294830b4dc0612d198d26 Mon Sep 17 00:00:00 2001 +From aa658d96f59d0e29f0d9208b8fbb3cce42e57edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Wed, 8 May 2019 10:42:03 +0200 Subject: [PATCH] cmake: Use find_package() to find Snappy @@ -9,6 +9,8 @@ in static link configurations] Signed-off-by: Thomas Petazzoni [Fabrice : updated for 1.23] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- CMakeLists.txt | 12 ++++++++---- cmake/FindSnappy.cmake | 31 +++++++++++++++++++++++++++++++ @@ -16,7 +18,7 @@ Signed-off-by: Fabrice Fontaine create mode 100644 cmake/FindSnappy.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt -index 78fead6..2efccda 100644 +index 436a9fe5513f..bbd179d3be59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,6 +6,9 @@ cmake_minimum_required(VERSION 3.9) @@ -29,9 +31,9 @@ index 78fead6..2efccda 100644 # C standard can be overridden when this is used as a sub-project. if(NOT CMAKE_C_STANDARD) # This project can use C11, but will gracefully decay down to C89. -@@ -31,13 +34,14 @@ option(LEVELDB_INSTALL "Install LevelDB's header and library" ON) - include(TestBigEndian) - test_big_endian(LEVELDB_IS_BIG_ENDIAN) +@@ -34,13 +37,14 @@ option(LEVELDB_BUILD_TESTS "Build LevelDB's unit tests" ON) + option(LEVELDB_BUILD_BENCHMARKS "Build LevelDB's benchmarks" ON) + option(LEVELDB_INSTALL "Install LevelDB's header and library" ON) +find_package(Snappy) + @@ -45,7 +47,7 @@ index 78fead6..2efccda 100644 check_library_exists(tcmalloc malloc "" HAVE_TCMALLOC) include(CheckCXXSymbolExists) -@@ -276,9 +280,9 @@ endif(HAVE_ATOMIC) +@@ -298,9 +302,9 @@ endif(HAVE_ATOMIC) if(HAVE_CRC32C) target_link_libraries(leveldb crc32c) endif(HAVE_CRC32C) @@ -60,7 +62,7 @@ index 78fead6..2efccda 100644 endif(HAVE_TCMALLOC) diff --git a/cmake/FindSnappy.cmake b/cmake/FindSnappy.cmake new file mode 100644 -index 0000000..88c1de9 +index 000000000000..88c1de98f228 --- /dev/null +++ b/cmake/FindSnappy.cmake @@ -0,0 +1,31 @@ @@ -96,5 +98,5 @@ index 0000000..88c1de9 + ) +endif() -- -2.26.2 +2.43.0