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 AEC5545DB9 for ; Wed, 27 Nov 2024 18:21:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A3798402E4; Wed, 27 Nov 2024 18:21:58 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 390CD402E4 for ; Wed, 27 Nov 2024 18:21:57 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1732728116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Wki61wM2vTnApjRnzRmrLFyXkHf6Tlmivaprdk5KhVs=; b=R66kEf8ZJnweE+2ryo+QeDScNjViUWnka+2/TXZOaN8hg42CRzge6QdYMo9oYC6QBNpf3K YDIufHFPTeYbzI+kYkSqPxaBoxClVy42ma2Amh7xl4jrPiWiBnjdhrJkMfdsOMpxirvDEJ 7bc//MbmKG4w5d+XZkIhKC2vtgYZWDo= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-19-uxnKmE8ROKWdtNe8HXAHVw-1; Wed, 27 Nov 2024 12:21:53 -0500 X-MC-Unique: uxnKmE8ROKWdtNe8HXAHVw-1 X-Mimecast-MFC-AGG-ID: uxnKmE8ROKWdtNe8HXAHVw Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D97731955BCF; Wed, 27 Nov 2024 17:21:51 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.52]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E0C5D300019E; Wed, 27 Nov 2024 17:21:49 +0000 (UTC) From: Kevin Traynor 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 21.11.9 Date: Wed, 27 Nov 2024 17:18:13 +0000 Message-ID: <20241127171916.690404-66-ktraynor@redhat.com> In-Reply-To: <20241127171916.690404-1-ktraynor@redhat.com> References: <20241127171916.690404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LoekLpAaG-Ho2gjmyAcEJ9uZcQkjuCMgk-XzCNrYnHc_1732728112 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit content-type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/02/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/9808e7550b47f902227559193c5f6b4a89f2e68d Thanks. Kevin --- >From 9808e7550b47f902227559193c5f6b4a89f2e68d 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 e6448532bd..a017ebd25b 100644 --- a/drivers/crypto/ipsec_mb/meson.build +++ b/drivers/crypto/ipsec_mb/meson.build @@ -14,5 +14,5 @@ if not lib.found() 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 -- 2.47.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-11-27 17:17:40.349084770 +0000 +++ 0066-build-remove-version-check-on-compiler-links-functio.patch 2024-11-27 17:17:38.259269549 +0000 @@ -1 +1 @@ -From 2909f9afbfd1b54ace204d40d57b68e6058aca28 Mon Sep 17 00:00:00 2001 +From 9808e7550b47f902227559193c5f6b4a89f2e68d 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,11 +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 -@@ -44,5 +44,5 @@ else - 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 @@ -40 +29 @@ -index 87bf965554..81631d3050 100644 +index e6448532bd..a017ebd25b 100644 @@ -43 +32 @@ -@@ -18,5 +18,5 @@ if not lib.found() +@@ -14,5 +14,5 @@ if not lib.found()