From patchwork Wed May 22 07:02:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 3125 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 03EEB3F9F8 for ; Wed, 22 May 2024 09:03:14 +0200 (CEST) Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-56e645a8762sf496062a12.3 for ; Wed, 22 May 2024 00:03:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716361394; cv=pass; d=google.com; s=arc-20160816; b=FW9e33nx6zI8gP2/E4eg1qAX9OJ3W/LsNS1Ok8v8RPJSVjYmJCVcXs/ynUjAnN/l62 E+HrmzJMoyp8fJpE8Kc8Xe3qKuv1W+JX/Hrm1p0CIuXT4WCUOBmKlQqotoH/YHZHXf1w L4fz+SATnTi1JgfYA4D6CzK0zoDrJFXzBkDVvn7t9BWfgiPk5upI6FTTA/m4uUXEb9Xv exL3CHbyssx2rPqVu3ge5Rf77PZRmcjQ8DkFGMHSDg/f6EFpSWEOCbLmbIdDftSq3uiy ABOKXEBd9iKHsFTSfBs9mzTtpKvv0cAuISopM6G+u91jMKcTMv8wmnnLjuMquQOyzJhK qCUA== 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:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=er9S94NdBWiIKOkvMu5T7O6qadozYR9PN5O/cjpt8dI=; fh=g2Qjuvx4x9M5EMEdGaFsGJtkjjTaqWeTNgtfgLt4gzk=; b=dHC/VutWPb46nkc9ktaz7ii1aWT/z4sBl2Dp+JUglT8CufmT5FWwMOWhDSGbELfPUJ qyoYLFOLMH/OfyDA/4i5JhEAhjv9vk5IiQ6vKr6h3++ww2HYJigtLnx2pkmp/kiyqX3D IqFin06l1/wmC07ZD1QmYAH/qQJIs4ccrfFDPEU8bwxfW9lELi2Axw3if5HjPb6tjgcW T1wwZvrZGkWXOc6vvnoMzq0A12MB3mI/u6p8sNV78H1/87OqfU73k9UCIBztjLQwF0Tu P1ZomRGm0NaaaQXIRZx76cLc/Jtds6rTPX29NBtxNI2hL2DyDL6VV369QAdLw1SQz9Vd BR6Q==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JL2zD6oA; 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=1716361394; x=1716966194; 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:references:in-reply-to:message-id :date:subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=er9S94NdBWiIKOkvMu5T7O6qadozYR9PN5O/cjpt8dI=; b=Jr+6EO0aN9PeIBuPp0B9eBLsBQc9nkdLJRqzY8vb5SSCI4Lq7UTvAyElI7jOSqsqjl bv/qRXSqPAa3hO0E17L7snH0OlVgbvLRqtYpBHFxGRHvhMRVjLjEBqut3ojLzQTFe/Jw Eeyk+ui3MMOn2ulSBjTaKOVx4yzSmwnMPCoyo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716361394; x=1716966194; 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 :references:in-reply-to:message-id:date:subject:cc:to:from :x-beenthere:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=er9S94NdBWiIKOkvMu5T7O6qadozYR9PN5O/cjpt8dI=; b=wmIyWYsnGvbG0yH1+ek2aHsg+uuKp7rKjZstOumL6f4y07KG2UpLTzBxAdsICERoxl TuKigIs5pWyMRgtBQIv12hb6ZmccYHN9yPemujpoQTl+Gf3w/2hllac6hzBGWHcGJWJJ bts3riXTBjarjSkRrw1SxFDF4+zJvVdSTzIQdti32l3qcjfGa6FXIeGS0spgv9ED9xNj ekC1A3WOB0SOjDSq1rBlUoIKJdcFeSbiCJX4RucHE4swwUpU1vkrBMD/3QnyrWGEJeqz fpNx/Bwa/thmZCN4ARdF0R5dxxhcTFo5nvQRkJjnO3wkJHd8PfhpjTbEfwU0iYQuK5Bq rrfg== X-Forwarded-Encrypted: i=2; AJvYcCWIe8bpbaQwuLyz0Yw98CxnczU345K2IdVZI+5+Wtak4AnkevBeirVRFtGrGf3gLbsOMKoNhI7sCAIx6RUu2jZi+jsgvtKJNraivcciv829mMPJ+9t903QcC8bhqQ== X-Gm-Message-State: AOJu0YwDeC3kIAVO3UfwxFULi6vewPqBtdQxhJyqlYoOVuVpg296C8au hqsvuGcsDQNykbdpO4wEhyuRV46u91ZGNwMxuUE7s6tJVWNBcegBAEOS8woWj4Iz7w== X-Google-Smtp-Source: AGHT+IETkdip4PLYWcM8XoM0sc7YNQPqWwO7HxvZiXWrw3hE7t0kA/H5P2nqvCQjVImuEuq0Hn7GKA== X-Received: by 2002:a50:9e2e:0:b0:572:7c99:a280 with SMTP id 4fb4d7f45d1cf-578329e295cmr754611a12.15.1716361393561; Wed, 22 May 2024 00:03:13 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a05:6402:2424:b0:572:6ddc:bb0f with SMTP id 4fb4d7f45d1cf-573332d9f22ls391306a12.1.-pod-prod-03-eu; Wed, 22 May 2024 00:03:12 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWIZF5RtDllIhWsefgFa2jRtlQLS9hoIPhqPzxeU/tNkUOkyG4Xc3LB4VysfrmQE11c1jxVyhFeyU3V0jJeQK2EECCT0+IOXDe1tj7IIAvfSTh/ X-Received: by 2002:aa7:c788:0:b0:578:33f1:dafb with SMTP id 4fb4d7f45d1cf-57833f1defemr588079a12.4.1716361391996; Wed, 22 May 2024 00:03:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1716361391; cv=none; d=google.com; s=arc-20160816; b=WF/4tY1dTADMmdb4wPTOC3kiaNXnpbiM3O3gQR+ftA1deNE92vYrqP4xN4KbyRAYaj Hsl6VFNhRKrirbOAK+Yh5g0DJPE31WUga0pO9E6VKAxGvv2QFs6H0ZCuAD9Z6G0S26Tp ah9Hd9jY21/tYBUcWv7rqtRKEPhVKgRLA+tJua2MztiTx8YDU8eQ44pkYVmJxMsAwLmp Yp0lwWdaJuSUMgbg0DrFtSeFS/RmbXfo9R015JAjo5QFUHc7by2Ckvf6tLmIK7Y5Qtfn CSEJbNUwPpeOg8W9fK66Q8e0QsIOyBwhVL5ZolELzXxtT8KP6BZ2SjEb9X6Gz9+u8eVA ZniA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=ei6QerQpjg4oD86F8bttymmIhDiYrWLAh9bDB1tVqDM=; fh=JLCaPy3fP+DnHMJnez9wioUlAxs0QwRa5cp1jlqXvWY=; b=gsg9h5f/R2Hu//QAuep5g+PRnCWDy36QrgPU8qlTSBMGCtzDvi0Vyisyff+MYXyDtq LVzlgBpZF6yLhTpKDnGz8ZCkcLMzjVOGSvya3Rfs+S6rw0klliapgGU0/wFuiAH1S2w1 mz5Rx0wVe7Qcu0WUPXVphyUtWInrmwTQrBdOHpHsCAV0a5M78SY+eyfiwkDuLLjxVR/w eBuw5Ii4WhDAPM/oO/xWMnH2tz7vBtEaxPeyzi9FH+OJr3hgE3DlFU8c/ldXL55jFQaI C/jTOEDV5XHOUC5/SDjb9/uYUcJXCJZWef6SqmPWg39F+r93935o1pMZK7cgxbefqUuO uJnQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JL2zD6oA; 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 4fb4d7f45d1cf-5733bead3d4sor7277637a12.3.2024.05.22.00.03.11 for (Google Transport Security); Wed, 22 May 2024 00:03:11 -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; AJvYcCVMlzan3R16oARZ1bkJm7toqg/+c9ffArHdNOgpO7yKquL+n60CUn6/Nf/PXALflEVaeKdh3tBXJ8+wpdopjJ9NKhu1WNTCN0UnHkp/Ydz3sqfm X-Received: by 2002:aa7:c788:0:b0:578:33f1:dafb with SMTP id 4fb4d7f45d1cf-57833f1defemr588060a12.4.1716361391490; Wed, 22 May 2024 00:03:11 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.amarulasolutions.com ([2.196.40.196]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-574d738c80csm12028365a12.81.2024.05.22.00.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 May 2024 00:03:11 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: "Yann E . MORIN" , Jagan Teki , Romain Naour , Fabrice Fontaine , Mahyar Koshkouei , Giulio Benetti , Michael Nosthoff , Alex Suykov , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= , Bernd Kuhls , Peter Korsgaard , Julien Corjon , Sergey Matyukevich , linux-amarula@amarulasolutions.com, michael@amarulasolutions.com, Dario Binacchi Subject: [PATCH v2 16/18] package/qt5/qt5base: update the patches to be applied with fuzz 0 Date: Wed, 22 May 2024 09:02:35 +0200 Message-ID: <20240522070238.3282121-17-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> References: <20240522070238.3282121-1-dario.binacchi@amarulasolutions.com> 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=JL2zD6oA; 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: , This commit allows the package patches to be applied with fuzz factor 0. The fuzz factor specifies how many lines of the patch can be inexactly matched, so the value 0 requires all lines to be exactly matched. Signed-off-by: Dario Binacchi --- .../qt5base/0006-Fix-build-on-riscv32.patch | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch index 5561acb9ae04..ff24fbff8305 100644 --- a/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch +++ b/package/qt5/qt5base/0006-Fix-build-on-riscv32.patch @@ -1,7 +1,7 @@ -From 035dc537bee26e3b63a211b2835d8560439e161f Mon Sep 17 00:00:00 2001 +From 25a0057e8d7afaab3492e03efb3f85581f1cf9b2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 27 Aug 2021 16:28:32 +0200 -Subject: Fix build on riscv32 +Subject: [PATCH] Fix build on riscv32 riscv32 fails to build because __NR_futex is not defined on this architecture: @@ -21,15 +21,17 @@ Reviewed-by: Thiago Macieira [Retrieved from: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=035dc537bee26e3b63a211b2835d8560439e161f] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- src/corelib/thread/qfutex_p.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h -index 40482b6fc1..037207a5c0 100644 +index f287b752d75f..fd7d09ac8572 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h -@@ -103,6 +103,11 @@ QT_END_NAMESPACE +@@ -81,6 +81,11 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 @@ -38,9 +40,9 @@ index 40482b6fc1..037207a5c0 100644 +# define __NR_futex __NR_futex_time64 +# endif + - QT_BEGIN_NAMESPACE - namespace QtLinuxFutex { - constexpr inline bool futexAvailable() { return true; } + # if __has_feature(thread_sanitizer) || defined(__SANITIZE_THREAD__) + # include + inline void _q_tsan_acquire(void *addr, void *addr2) -- -cgit v1.2.1 +2.43.0