patch 'build: remove version check on compiler links function' has been queued to stable release 21.11.9
Kevin Traynor
ktraynor at redhat.com
Wed Nov 27 18:18:13 CET 2024
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 <bruce.richardson at intel.com>
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 <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/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 at 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<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
@@ -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()
More information about the stable
mailing list