From: Xueming Li <xuemingl@nvidia.com>
To: Bruce Richardson <bruce.richardson@intel.com>
Cc: <xuemingl@nvidia.com>, Robin Jarry <rjarry@redhat.com>,
Ferruh Yigit <ferruh.yigit@amd.com>,
Chengwen Feng <fengchengwen@huawei.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'build: remove version check on compiler links function' has been queued to stable release 23.11.3
Date: Mon, 11 Nov 2024 14:28:39 +0800 [thread overview]
Message-ID: <20241111062847.216344-114-xuemingl@nvidia.com> (raw)
In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com>
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@nvidia.com>
---
From b2d1e9cfcd735986ffef0ec88d604971a8172708 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson@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@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@intel.com>
Reviewed-by: Robin Jarry <rjarry@redhat.com>
Tested-by: Ferruh Yigit <ferruh.yigit@amd.com>
Acked-by: Chengwen Feng <fengchengwen@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@nvidia.com>
+
+[ upstream commit 2909f9afbfd1b54ace204d40d57b68e6058aca28 ]
@@ -17 +19,0 @@
-Cc: stable@dpdk.org
@@ -29 +31 @@
-index 3893b127dd..5a8de16fe0 100644
+index 62abcb6fe3..3d28bd2af5 100644
next prev parent reply other threads:[~2024-11-11 6:40 UTC|newest]
Thread overview: 128+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-11 6:26 patch " Xueming Li
2024-11-11 6:26 ` patch 'bus/vdev: revert fix devargs in secondary process' " Xueming Li
2024-11-11 6:26 ` patch 'log: add a per line log helper' " Xueming Li
2024-11-12 9:02 ` David Marchand
2024-11-12 11:35 ` Xueming Li
2024-11-12 12:47 ` David Marchand
2024-11-12 13:56 ` Xueming Li
2024-11-12 14:09 ` David Marchand
2024-11-12 14:11 ` Xueming Li
2024-11-11 6:26 ` patch 'drivers: remove redundant newline from logs' " Xueming Li
2024-11-11 6:26 ` patch 'eal/x86: fix 32-bit write combining store' " Xueming Li
2024-11-11 6:26 ` patch 'test/event: fix schedule type' " Xueming Li
2024-11-11 6:26 ` patch 'test/event: fix target event queue' " Xueming Li
2024-11-11 6:26 ` patch 'examples/eventdev: fix queue crash with generic pipeline' " Xueming Li
2024-11-11 6:26 ` patch 'crypto/dpaa2_sec: fix memory leak' " Xueming Li
2024-11-11 6:26 ` patch 'common/dpaax/caamflib: fix PDCP SNOW-ZUC watchdog' " Xueming Li
2024-11-11 6:26 ` patch 'dev: fix callback lookup when unregistering device' " Xueming Li
2024-11-11 6:26 ` patch 'crypto/scheduler: fix session size computation' " Xueming Li
2024-11-11 6:26 ` patch 'examples/ipsec-secgw: fix dequeue count from cryptodev' " Xueming Li
2024-11-11 6:26 ` patch 'bpf: fix free function mismatch if convert fails' " Xueming Li
2024-11-11 6:27 ` patch 'baseband/la12xx: fix use after free in modem config' " Xueming Li
2024-11-11 6:27 ` patch 'common/qat: fix use after free in device probe' " Xueming Li
2024-11-11 6:27 ` patch 'common/idpf: fix use after free in mailbox init' " Xueming Li
2024-11-11 6:27 ` patch 'crypto/bcmfs: fix free function mismatch' " Xueming Li
2024-11-11 6:27 ` patch 'dma/idxd: fix free function mismatch in device probe' " Xueming Li
2024-11-11 6:27 ` patch 'event/cnxk: fix free function mismatch in port config' " Xueming Li
2024-11-11 6:27 ` patch 'net/cnxk: fix use after free in mempool create' " Xueming Li
2024-11-11 6:27 ` patch 'net/cpfl: fix invalid free in JSON parser' " Xueming Li
2024-11-11 6:27 ` patch 'net/e1000: fix use after free in filter flush' " Xueming Li
2024-11-11 6:27 ` patch 'net/nfp: fix double free in flow destroy' " Xueming Li
2024-11-11 6:27 ` patch 'net/sfc: fix use after free in debug logs' " Xueming Li
2024-11-11 6:27 ` patch 'raw/ifpga/base: fix use after free' " Xueming Li
2024-11-11 6:27 ` patch 'raw/ifpga: fix free function mismatch in interrupt config' " Xueming Li
2024-11-11 6:27 ` patch 'examples/vhost: fix free function mismatch' " Xueming Li
2024-11-11 6:27 ` patch 'net/nfb: fix use after free' " Xueming Li
2024-11-11 6:27 ` patch 'power: enable CPPC' " Xueming Li
2024-11-11 6:27 ` patch 'fib6: add runtime checks in AVX512 lookup' " Xueming Li
2024-11-11 6:27 ` patch 'pcapng: fix handling of chained mbufs' " Xueming Li
2024-11-11 6:27 ` patch 'app/dumpcap: fix handling of jumbo frames' " Xueming Li
2024-11-11 6:27 ` patch 'ml/cnxk: fix handling of TVM model I/O' " Xueming Li
2024-11-11 6:27 ` patch 'net/cnxk: fix Rx timestamp handling for VF' " Xueming Li
2024-11-11 6:27 ` patch 'net/cnxk: fix Rx offloads to handle timestamp' " Xueming Li
2024-11-11 6:27 ` patch 'event/cnxk: fix Rx timestamp handling' " Xueming Li
2024-11-11 6:27 ` patch 'common/cnxk: fix MAC address change with active VF' " Xueming Li
2024-11-11 6:27 ` patch 'common/cnxk: fix inline CTX write' " Xueming Li
2024-11-11 6:27 ` patch 'common/cnxk: fix CPT HW word size for outbound SA' " Xueming Li
2024-11-11 6:27 ` patch 'net/cnxk: fix OOP handling for inbound packets' " Xueming Li
2024-11-11 6:27 ` patch 'event/cnxk: fix OOP handling in event mode' " Xueming Li
2024-11-11 6:27 ` patch 'common/cnxk: fix base log level' " Xueming Li
2024-11-11 6:27 ` patch 'common/cnxk: fix IRQ reconfiguration' " Xueming Li
2024-11-11 6:27 ` patch 'baseband/acc: fix access to deallocated mem' " Xueming Li
2024-11-11 6:27 ` patch 'baseband/acc: fix soft output bypass RM' " Xueming Li
2024-11-11 6:27 ` patch 'vhost: fix offset while mapping log base address' " Xueming Li
2024-11-11 6:27 ` patch 'vdpa: update used flags in used ring relay' " Xueming Li
2024-11-11 6:27 ` patch 'vdpa/nfp: fix hardware initialization' " Xueming Li
2024-11-11 6:27 ` patch 'vdpa/nfp: fix reconfiguration' " Xueming Li
2024-11-11 6:27 ` patch 'net/virtio-user: reset used index counter' " Xueming Li
2024-11-11 6:27 ` patch 'vhost: restrict set max queue pair API to VDUSE' " Xueming Li
2024-11-11 6:27 ` patch 'fib: fix AVX512 lookup' " Xueming Li
2024-11-11 6:27 ` patch 'net/e1000: fix link status crash in secondary process' " Xueming Li
2024-11-11 6:27 ` patch 'net/cpfl: add checks for flow action types' " Xueming Li
2024-11-11 6:27 ` patch 'net/iavf: fix crash when link is unstable' " Xueming Li
2024-11-11 6:27 ` patch 'net/cpfl: fix parsing protocol ID mask field' " Xueming Li
2024-11-11 6:27 ` patch 'net/ice/base: fix link speed for 200G' " Xueming Li
2024-11-11 6:27 ` patch 'net/ice/base: fix iteration of TLVs in Preserved Fields Area' " Xueming Li
2024-11-11 6:27 ` patch 'net/ixgbe/base: fix unchecked return value' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix setting flags in init function' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix misleading debug logs and comments' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: add missing X710TL device check' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix blinking X722 with X557 PHY' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix DDP loading with reserved track ID' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix repeated register dumps' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix unchecked return value' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e/base: fix loop bounds' " Xueming Li
2024-11-11 6:27 ` patch 'net/iavf: delay VF reset command' " Xueming Li
2024-11-11 6:27 ` patch 'net/i40e: fix AVX-512 pointer copy on 32-bit' " Xueming Li
2024-11-11 6:27 ` patch 'net/ice: " Xueming Li
2024-11-11 6:27 ` patch 'net/iavf: " Xueming Li
2024-11-11 6:27 ` patch 'common/idpf: " Xueming Li
2024-11-11 6:27 ` patch 'net/gve: fix queue setup and stop' " Xueming Li
2024-11-11 6:28 ` patch 'net/gve: fix Tx for chained mbuf' " Xueming Li
2024-11-11 6:28 ` patch 'net/tap: avoid memcpy with null argument' " Xueming Li
2024-11-11 6:28 ` patch 'app/testpmd: remove unnecessary cast' " Xueming Li
2024-11-11 6:28 ` patch 'net/pcap: set live interface as non-blocking' " Xueming Li
2024-11-11 6:28 ` patch 'net/mana: support rdma-core via pkg-config' " Xueming Li
2024-11-11 6:28 ` patch 'net/ena: revert redefining memcpy' " Xueming Li
2024-11-11 6:28 ` patch 'net/hns3: remove some basic address dump' " Xueming Li
2024-11-11 6:28 ` patch 'net/hns3: fix dump counter of registers' " Xueming Li
2024-11-11 6:28 ` patch 'ethdev: fix overflow in descriptor count' " Xueming Li
2024-11-11 6:28 ` patch 'bus/dpaa: fix PFDRs leaks due to FQRNIs' " Xueming Li
2024-11-11 6:28 ` patch 'net/dpaa: fix typecasting channel ID' " Xueming Li
2024-11-11 6:28 ` patch 'bus/dpaa: fix VSP for 1G fm1-mac9 and 10' " Xueming Li
2024-11-11 6:28 ` patch 'bus/dpaa: fix the fman details status' " Xueming Li
2024-11-11 6:28 ` patch 'net/dpaa: fix reallocate mbuf handling' " Xueming Li
2024-11-11 6:28 ` patch 'net/gve: fix mbuf allocation memory leak for DQ Rx' " Xueming Li
2024-11-11 6:28 ` patch 'net/gve: always attempt Rx refill on DQ' " Xueming Li
2024-11-11 6:28 ` patch 'net/nfp: fix type declaration of some variables' " Xueming Li
2024-11-11 6:28 ` patch 'net/nfp: fix representor port link status update' " Xueming Li
2024-11-11 6:28 ` patch 'net/gve: fix refill logic causing memory corruption' " Xueming Li
2024-11-11 6:28 ` patch 'net/gve: add IO memory barriers before reading descriptors' " Xueming Li
2024-11-11 6:28 ` patch 'net/memif: fix buffer overflow in zero copy Rx' " Xueming Li
2024-11-11 6:28 ` patch 'net/tap: restrict maximum number of MP FDs' " Xueming Li
2024-11-11 6:28 ` patch 'ethdev: verify queue ID in Tx done cleanup' " Xueming Li
2024-11-11 6:28 ` patch 'net/hns3: verify reset type from firmware' " Xueming Li
2024-11-11 6:28 ` patch 'net/nfp: fix link change return value' " Xueming Li
2024-11-11 6:28 ` patch 'net/nfp: fix pause frame setting check' " Xueming Li
2024-11-11 6:28 ` patch 'net/pcap: fix blocking Rx' " Xueming Li
2024-11-11 6:28 ` patch 'net/ice/base: add bounds check' " Xueming Li
2024-11-11 6:28 ` patch 'net/ice/base: fix VLAN replay after reset' " Xueming Li
2024-11-11 6:28 ` patch 'net/iavf: preserve MAC address with i40e PF Linux driver' " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: workaround list management of Rx queue control' " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5/hws: fix flex item as tunnel header' " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: add flex item query for tunnel mode' " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: fix flex item " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: fix number of supported flex parsers' " Xueming Li
2024-11-11 6:28 ` patch 'app/testpmd: remove flex item init command leftover' " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: fix next protocol validation after flex item' " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: fix non full word sample fields in " Xueming Li
2024-11-11 6:28 ` patch 'net/mlx5: fix flex item header length field translation' " Xueming Li
2024-11-11 6:28 ` Xueming Li [this message]
2024-11-11 6:28 ` patch 'hash: fix thash LFSR initialization' " Xueming Li
2024-11-11 6:28 ` patch 'net/nfp: notify flower firmware about PF speed' " Xueming Li
2024-11-11 6:28 ` patch 'net/nfp: do not set IPv6 flag in transport mode' " Xueming Li
2024-11-11 6:28 ` patch 'dmadev: fix potential null pointer access' " Xueming Li
2024-11-11 6:28 ` patch 'net/gve/base: fix build with Fedora Rawhide' " Xueming Li
2024-11-11 6:28 ` patch 'power: fix mapped lcore ID' " Xueming Li
2024-11-11 6:28 ` patch 'net/ionic: fix build with Fedora Rawhide' " Xueming Li
2024-11-11 6:28 ` patch '' " Xueming Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241111062847.216344-114-xuemingl@nvidia.com \
--to=xuemingl@nvidia.com \
--cc=bruce.richardson@intel.com \
--cc=fengchengwen@huawei.com \
--cc=ferruh.yigit@amd.com \
--cc=rjarry@redhat.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).