From patchwork Sat Jul 6 14:20:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3180 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 7D4E03F24D for ; Sat, 6 Jul 2024 16:20:56 +0200 (CEST) Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-58bb8f00685sf2026717a12.3 for ; Sat, 06 Jul 2024 07:20:56 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1720275656; cv=pass; d=google.com; s=arc-20160816; b=K86AzDzaveTbZnDYFeTjyDQJ7flLIPB8Eojw6Y9N3Ul/QffgZU1oUp4yOQWLBIevog X8gWz9NQiMl6MuP7ig3NiFDsZn68sVsye2EjCVHkARTgL5CplBEMrw4iEuePORgLU3GP 4K2fzNqxuvxrBWODEJJUp3FCj/PeH8aDOyZLEOXsZBxJnYa2Vo3Xq/f4eJN3KVTPuvhY 1XW6FooTZXi4U4Ql7LHstT3Xc/TEFP0eDabJ07RvpLzXFeEhuWb/nFAUKvMhXrfM7vmX PJsAfgzqsqjRA3Lxh0vkca7NtAwOu3OqJDeYp9C7btI9b3yHs7/Ym93bfKLm/r/PoFRP IqGQ== 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=XtCWbi0cMWxEr+iVJxGt14NoloGE3BTAY161+Bk9k2U=; fh=egWrBx8TVehbmVB16UMZh52BrJNTvgYzg2R5HluR/rs=; b=ptMwMs/+3kbE4OgcVD87N35DL9/SqLTDonfxY6FWO1nPt6fWCbYYOOzEVs6A66Cq6+ help7hd6Qz1qwApEh8vSsGE+0mNpBv4+2Ab8+beMXuGx9NhyEV7BqELK9H0G7562uezz G4hf0YVCfQbcHib7Jn1fIGvJQyCbJNlP+LpPCIbSWLHqNCjzUS2Qi4tqFSEIAxGI+vZz p9R6kLcrpjLBSpZVOvsfqbQIFjQ09kqzGAB4A2gRlOOfQkS9vaKcl2SnJxCLfjbF8Nld g3ZyWuzuMGF/n9IQI59dhx7y/pi6rg4gBm1QeKZX0h8K9uMyiB/v6lxIeOoJ5CXxzbjH uMKQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=XZfHjkb8; 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=1720275656; x=1720880456; 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=XtCWbi0cMWxEr+iVJxGt14NoloGE3BTAY161+Bk9k2U=; b=KDxYF+f/5xSCj3W5S62KZf1QF0K3RpIZdnoqTqSt6kgB3pviKBddM2/XcK62OA7dGS f8i99QUdN7BXj69MotpLEO/Zcdu+gVF7uclZRZJE+CcjqlX86o0CZFrWxtyi0k/6ggrb ny7UlfiJgN2TzIrXKO5Gi2dIn83eZN4gn/3Zk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720275656; x=1720880456; 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=XtCWbi0cMWxEr+iVJxGt14NoloGE3BTAY161+Bk9k2U=; b=XUloW/TNIxjrPbuahb+KfS9H1zEr8r+63KKY2Sfz4k+69Lz/cIWGnYhco28IValdqC utIUL8afCShUE49pWRyj2w4f1I0f4u95uM7ybP62557aOiwGRgm8RwHaJ8ImOSGiOkCu pVkRZ5fBIQZT3q9uyrrFiKGzZ6E16DUDdMYpmIRGY+0gcTaNTrhGLvow4bagS+xjMSUw Fn5IIUAsP7aj7HMsIVOfVz6GFOcH4yh7d7+e5sA7bjN7h6/IM3BkG3CJ0Ues18As8AP0 K0OL2R+TO0uk36WRHuCG1YWdgw1tGGSs0TdDYFMddHIcRLdrxTnF3vAPXObX6XUp6Wd6 CHLw== X-Forwarded-Encrypted: i=2; AJvYcCWMmHBZcvq2XwRJfb+xQvtxptk1CdlBfWJ/0Y0fg30orBrx/Lu7uulD/Z3Qaq6UX7Wm11trYggn2uyt/6hvnZRVjOHg4FMfyXDW2Pg1IYjLJ9fFyLWQbUptEWncPw== X-Gm-Message-State: AOJu0YxSwmwvsCaw9eVegrEb05X7JMyOYeC9bLGumdM6ChmyFYtCARCi b7/R3gLn1DypN7GAfYTEGUMkPT/pXEqrGqX0BjjELqyIBbKUL3cddpaH2yofhUeUcA== X-Google-Smtp-Source: AGHT+IFdI7sR/zyN4U8OpiPoGK4sVJ1TLNeRK7PEdenC1B6jnr1chJ7yO/OmMkZnnxtizPHVENWuYQ== X-Received: by 2002:a05:6402:84b:b0:57c:a7fe:d275 with SMTP id 4fb4d7f45d1cf-58e5b5a6320mr5207333a12.32.1720275656017; Sat, 06 Jul 2024 07:20:56 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:4303:b0:58c:654:7dac with SMTP id 4fb4d7f45d1cf-58e24bce1bfls1528612a12.2.-pod-prod-06-eu; Sat, 06 Jul 2024 07:20:54 -0700 (PDT) X-Received: by 2002:a17:907:608f:b0:a6f:1d90:3415 with SMTP id a640c23a62f3a-a77ba47873dmr540019966b.17.1720275654454; Sat, 06 Jul 2024 07:20:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1720275654; cv=none; d=google.com; s=arc-20160816; b=zEL1e6qtRUuHucH9AqJEQS/cYnffv8kSnOknMKM/KQ/CKa/41ajx7vCnmxZMDcUZy/ 2wk67YhJzqxh+YW8xTYrDBE6p0Y+o1ytyKTDKst5+Q0fBynzn97PIhuheuzt/s2++PNm Aw5asZZ3n9jMpWV2qpJqcCZsiAntmmxpawy59gpE63iNfzkpGSRfC+cVIaLRGrHe87QY kL/Y0WtCX8HyUkHe5YU+wGrvAjwVTUe9WNhcWxZ7irFPHlfAqZgSBhba9NnIT0oIfckp lCHydQE85x5vSoMn2LhJgwlOYrxt1ns3uFDcHDrOhr8Q19wXZ/vASm+RKH/zkpRWvhp/ MLTw== 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=2oNgUK/ZTAT76H7fus36xf9CGIg34W3g05h0YsHvOhs=; fh=4aH47D1o6z03SLGX3S5iBqzHxVYI/WCfhxxmm+dgjk8=; b=ZXAKXVa5lv/e8fz7omwqBtZYamob+ZC1VR8qASf4g6F1nCD5r4wWll09t4jJ2NHTbX IOVP6YEkEUheM5Tr2ibA0BJn75KmNN2a+LS+AhTB64liyxwgbPjftq4fbFgyr5i81igY 9A0nGvgBXfJXhAUz72tY+3DZTEk/T4UIt/QSvDRVXfQWGigIr69rXRVXnf1eEfKxvyCq k9iAT7km0BAhHR0r6I9Tl++uaQKVuwtRFJY01U4lwGPcb4lc7XTt2VWoteB0q8v7j5ya 2jZFOf4XqYn48zIirq+qkLJAP7TijvfCglKmp4wnZcqR43c1GDnir5c4DKNROWA/1S1z g1pw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=XZfHjkb8; 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-a77e3c5de40sor33969766b.15.2024.07.06.07.20.54 for (Google Transport Security); Sat, 06 Jul 2024 07:20:54 -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-Received: by 2002:a17:907:3342:b0:a75:1069:5b94 with SMTP id a640c23a62f3a-a77ba47879amr447451666b.21.1720275653955; Sat, 06 Jul 2024 07:20:53 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-79-30-97-245.retail.telecomitalia.it. [79.30.97.245]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a7400456582sm667042466b.153.2024.07.06.07.20.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Jul 2024 07:20:53 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: linux-amarula@amarulasolutions.com, Dario Binacchi Subject: [PATCH 1/1] package/yajl: update the patches to be applied with fuzz 0 Date: Sat, 6 Jul 2024 16:20:50 +0200 Message-ID: <20240706142050.3693937-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=XZfHjkb8; 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, yajl fails to build with output: Applying 0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch using patch: patching file src/CMakeLists.txt Hunk #1 FAILED at 37. Hunk #2 succeeded at 52 (offset 1 line). Hunk #3 succeeded at 79 (offset 1 line). 1 out of 3 hunks FAILED -- saving rejects to file src/CMakeLists.txt.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi --- ...isable-shared-library-build-when-BUILD_SHARED.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch index 53decca64989..e9170772d43d 100644 --- a/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ b/package/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch @@ -7,6 +7,8 @@ When BUILD_SHARED_LIBS is off, you don't want to build the shared library. Signed-off-by: Samuel Martin +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) @@ -15,15 +17,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 99cf9e9..9e9c77d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) - +@@ -38,6 +38,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) + SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl) +IF(BUILD_SHARED_LIBS) ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) #### setup shared library version number -@@ -51,6 +52,7 @@ IF(APPLE) +@@ -52,6 +53,7 @@ IF(APPLE) SET_TARGET_PROPERTIES(yajl PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") ENDIF(APPLE) @@ -31,7 +33,7 @@ index 99cf9e9..9e9c77d 100644 #### build up an sdk as a post build step -@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) +@@ -78,10 +80,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) # at build time you may specify the cmake variable LIB_SUFFIX to handle # 64-bit systems which use 'lib64'