patch 'build: remove version check on compiler links function' has been queued to stable release 23.11.3

Xueming Li xuemingl at nvidia.com
Mon Nov 11 07:28:39 CET 2024


Hi,

FYI, your patch has been queued to stable release 23.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/30/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=b2d1e9cfcd735986ffef0ec88d604971a8172708

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From b2d1e9cfcd735986ffef0ec88d604971a8172708 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Fri, 20 Sep 2024 13:57:34 +0100
Subject: [PATCH] build: remove version check on compiler links function
Cc: Xueming Li <xuemingl at nvidia.com>

[ 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 <bruce.richardson at intel.com>
Reviewed-by: Robin Jarry <rjarry at redhat.com>
Tested-by: Ferruh Yigit <ferruh.yigit at amd.com>
Acked-by: Chengwen Feng <fengchengwen at huawei.com>
---
 drivers/common/qat/meson.build      | 2 +-
 drivers/crypto/ipsec_mb/meson.build | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 62abcb6fe3..3d28bd2af5 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<intel-ipsec-mb.h>'
     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',
diff --git a/drivers/crypto/ipsec_mb/meson.build b/drivers/crypto/ipsec_mb/meson.build
index 87bf965554..81631d3050 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.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-11-11 14:23:10.396636933 +0800
+++ 0113-build-remove-version-check-on-compiler-links-functio.patch	2024-11-11 14:23:05.352192835 +0800
@@ -1 +1 @@
-From 2909f9afbfd1b54ace204d40d57b68e6058aca28 Mon Sep 17 00:00:00 2001
+From b2d1e9cfcd735986ffef0ec88d604971a8172708 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 2909f9afbfd1b54ace204d40d57b68e6058aca28 ]
@@ -17 +19,0 @@
-Cc: stable at dpdk.org
@@ -29 +31 @@
-index 3893b127dd..5a8de16fe0 100644
+index 62abcb6fe3..3d28bd2af5 100644


More information about the stable mailing list