From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D2A6945BB6 for ; Wed, 23 Oct 2024 23:21:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8EC040261; Wed, 23 Oct 2024 23:21:40 +0200 (CEST) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mails.dpdk.org (Postfix) with ESMTP id BBE944333C for ; Wed, 23 Oct 2024 23:21:38 +0200 (CEST) Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4315e9e9642so2181475e9.0 for ; Wed, 23 Oct 2024 14:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718498; x=1730323298; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=mKr1LdoCGbukM4fWQCI0u0+ahWeQI4dKHTk7aLg3ajs=; b=O2Jdd00rY1k+wyQNsjWbiWDDXKiJ6Re8Y8T71cnrYk92fDNo0N7T07TeeTqfkDlVRj VfrUGHaDSbZ7n/i5kU9EhWXpL2uHhQ61OPgbpF/Udua9JBvHKfRxNvGn9VovZdbDYzak jBezAhDExje03baq/UNVwKcbMi7UNFon/7ryTfrEANRo9tfyxy0zbF2N2Ka+nF78P/4V paIsb9aw+aCcJbt4nFi87ShvaMK5EgEOVV0zO9nZHPj6M2bp3vlx9ubMSSbPq/rlSmBr fL66GaHWSZZjYjFNtOhje+CWhu2xTy9oWchDobf06AO0mqF4hIETS/yuV7QLxtVaDQ4h /MPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718498; x=1730323298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mKr1LdoCGbukM4fWQCI0u0+ahWeQI4dKHTk7aLg3ajs=; b=Qskq6dVNC/XMnDqRvD+ZNruV5DdyO22TjHDKIV4TGJLFVsj62P9ciH2JQqU+36NXea PL8Yyz0yQLv0h0R4fLRzt6pOOUMp1ahCgpmeIeSqGgUlRTciz+CoPLAQJv1HAaZxz24f ytcXI+azkbqZgKMum305r4IlnoSxTL94P33eGS1iLhEBvpcfMquHQrn6FmUY8+fWzuFj B+sWbm/T6ue23/D2RCoyHYDUMfgOiw2HU9+neokwL5mV1r1ajrXF0HwQgbQPThSQT/J+ 17nWFuVwbLqWJ++VINSuEbFYgeyR2/VTljCWQjpZTQ/J/EFTod29lbbq4w7Sy7ZACz14 I5Qg== X-Forwarded-Encrypted: i=1; AJvYcCXSVa33gW0UeksiNTiOrLXzbtZ9lknB438mhKMG1n6uNMfqQ4TWrK5+fCMtgikdBgarv/IfaZw=@dpdk.org X-Gm-Message-State: AOJu0YweMwjwpvMtZP/NceZ2YAZFqcbP96QTge5LzRjfZ6wPbdN7/TIo H7fYs1SqwX23KBxQApVDwYv9X377GtRO28KzghAqXYLjU5JmViMj X-Google-Smtp-Source: AGHT+IHolZ0B4SnSYzcuBZIJnwYhpSMaytXCIGXQgVbF1LpLFzuPxORb7hTKZURzoQ1+i8Nf4MhPQQ== X-Received: by 2002:a05:600c:35cd:b0:430:52ec:1e41 with SMTP id 5b1f17b1804b1-4318415c0acmr37051695e9.17.1729718498246; Wed, 23 Oct 2024 14:21:38 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0b9410dsm9746930f8f.79.2024.10.23.14.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:21:37 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Robin Jarry , Ferruh Yigit , Chengwen Feng , dpdk stable Subject: patch 'build: remove version check on compiler links function' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:54 +0100 Message-ID: <20241023211704.1216956-74-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/70c3227ccd5083b19028295cc8d247c10a21739c Thanks. Luca Boccassi --- >From 70c3227ccd5083b19028295cc8d247c10a21739c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Fri, 20 Sep 2024 13:57:34 +0100 Subject: [PATCH] build: remove version check on compiler links function [ upstream commit 2909f9afbfd1b54ace204d40d57b68e6058aca28 ] The "compiler.links()" function meson documentation [1] is a little unclear, in a casual reading implies that the function was new in 0.60 meson release. In fact, it is only enhanced as described in that release, but is present earlier. As such, we can remove the version checks preceding the calls to links function in our code. [1] https://mesonbuild.com/Reference-manual_returned_compiler.html#compilerlinks Fixes: fd809737cf8c ("common/qat: fix build with incompatible IPsec library") Fixes: fb94d8243894 ("crypto/ipsec_mb: add dependency check for cross build") Signed-off-by: Bruce Richardson Reviewed-by: Robin Jarry Tested-by: Ferruh Yigit Acked-by: Chengwen Feng --- drivers/crypto/ipsec_mb/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build index 4100d921ff..3981325173 100644 --- a/drivers/crypto/ipsec_mb/meson.build +++ b/drivers/crypto/ipsec_mb/meson.build @@ -17,7 +17,7 @@ if not lib.found() build = false reason = 'missing dependency, "libIPSec_MB"' # if the lib is found, check it's the right format -elif meson.version().version_compare('>=0.60') and not cc.links( +elif not cc.links( 'int main(void) {return 0;}', dependencies: lib) build = false reason = 'incompatible dependency, "libIPSec_MB"' -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:43.325023813 +0100 +++ 0074-build-remove-version-check-on-compiler-links-functio.patch 2024-10-23 22:16:40.555944919 +0100 @@ -1 +1 @@ -From 2909f9afbfd1b54ace204d40d57b68e6058aca28 Mon Sep 17 00:00:00 2001 +From 70c3227ccd5083b19028295cc8d247c10a21739c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 2909f9afbfd1b54ace204d40d57b68e6058aca28 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -24 +24,0 @@ - drivers/common/qat/meson.build | 2 +- @@ -26 +26 @@ - 2 files changed, 2 insertions(+), 2 deletions(-) + 1 file changed, 1 insertion(+), 1 deletion(-) @@ -28,13 +27,0 @@ -diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build -index 3893b127dd..5a8de16fe0 100644 ---- a/drivers/common/qat/meson.build -+++ b/drivers/common/qat/meson.build -@@ -43,7 +43,7 @@ else - IMB_required_ver = '1.4.0' - IMB_header = '#include' - libipsecmb = cc.find_library('IPSec_MB', required: false) -- if libipsecmb.found() and meson.version().version_compare('>=0.60') and cc.links( -+ if libipsecmb.found() and cc.links( - 'int main(void) {return 0;}', dependencies: libipsecmb) - # version comes with quotes, so we split based on " and take the middle - imb_ver = cc.get_define('IMB_VERSION_STR', @@ -42 +29 @@ -index 87bf965554..81631d3050 100644 +index 4100d921ff..3981325173 100644