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 6FF5745CE3 for ; Mon, 11 Nov 2024 07:40:58 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6473A4067A; Mon, 11 Nov 2024 07:40:58 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2051.outbound.protection.outlook.com [40.107.236.51]) by mails.dpdk.org (Postfix) with ESMTP id 69E174067A for ; Mon, 11 Nov 2024 07:40:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MsMkFQP/JOwi+RXA40ugluVaaHcoHihMwTa6tyNpfXFnNxhl7PANlmikaztfyoUW1ZJkJ2ovYDByNTrKDRLX59qrA092OuQkSY8SZchEY9v3dvXnVqTO5G4Zqhk2E1eUA1RWURkvzPnzReR3k3dwj47LpSAmFznGkyPAmoKh77+mBpM0M+JTn4Jdu8LOVaEvFXD0pOCpnXs5Az2xErSUYl005S5i1xkpwd/sRoLg4HsEpgpuVpFZzWczabh0lnbfhjtkUsBWwAcPZgEgjrnTsOlhaKQcYa1Z2TEz/3zzlWf5jw0uuFNxpjDIHfk7ep8w5XNtOjFOOlldnkOlJ/ZiOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=wDCwlqcdLXxeO9pvbSWyevYCMXZBklEMthoJemTXiho=; b=j1oeegILi4ESxoIwxLQzqj1CScGo6n9yMrbGJBypjiIqP1ORbgZ7JNr27NMz6dt2cIjU4S6y/nsyxEF8V2xmnZiww7M2zCIYGMxsSKlHkjgqBwlG5thg1y1S7xNE4bWkFTAanP48AieVKmm+6Njri7havnXaDiWIQ7TPbICA8V2t1UzokNwIFOQaKHGLM1GcvpsMkO5vmoy7xgdv1/zl8qVEeIhKMlWxnzFxxf6k38kXOe7xxWR1Q7uSVVHKRZSoNnhqCMc7U6NgOl6nca5Q1ZJ8RMBNSb86PHq3wMD5Z+Wtt51/OJBsDftlhICigTLfRyt1ndz1pOpvx/733j/qcA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wDCwlqcdLXxeO9pvbSWyevYCMXZBklEMthoJemTXiho=; b=pwLY5eOecOMW0H95HCcgrJMh6PPZOzaNNaAB8Kd3V3c6Vccwa9f/wW6oAvU9GCeTzLVtXR3R0YSWY77/T54odLcTP10cIT7VjwWqeBi6eKONsHPB10mCImFg+YPJ0F6ux7LP2CiZCK0ZPYwBQdH8ngB7oC9lxfoF3twEaPb+qroFb3dyA3CQ9nRtWFgP8J+pn1muoW45ksMRIsnyEBc+oO59gGdo1PlDRlXj8HGppzg0Ee+hU/g7S7c5K+nGf9aoRdd5LIUdZ3fZkDWMl3+eRlB00+nsmHKxT97abNgAWatM2yFmWfgVZRAikHeA2wFG6OERobYTC/2Qgn9s8rppQg== Received: from SA0PR11CA0082.namprd11.prod.outlook.com (2603:10b6:806:d2::27) by LV3PR12MB9409.namprd12.prod.outlook.com (2603:10b6:408:21d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28; Mon, 11 Nov 2024 06:40:52 +0000 Received: from SN1PEPF00026368.namprd02.prod.outlook.com (2603:10b6:806:d2:cafe::55) by SA0PR11CA0082.outlook.office365.com (2603:10b6:806:d2::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8137.28 via Frontend Transport; Mon, 11 Nov 2024 06:40:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by SN1PEPF00026368.mail.protection.outlook.com (10.167.241.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8158.14 via Frontend Transport; Mon, 11 Nov 2024 06:40:51 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:40:34 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 10 Nov 2024 22:40:31 -0800 From: Xueming Li 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 23.11.3 Date: Mon, 11 Nov 2024 14:28:39 +0800 Message-ID: <20241111062847.216344-114-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241111062847.216344-1-xuemingl@nvidia.com> References: <20241111062847.216344-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SN1PEPF00026368:EE_|LV3PR12MB9409:EE_ X-MS-Office365-Filtering-Correlation-Id: 7410d186-61f4-430d-dcf3-08dd021bc94e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?guACcQufi+cH89m+yIUsW1evYoPUZBHvuewFxE4mlJzoCaEbWQl/8aVXMrQs?= =?us-ascii?Q?mENJmctCr9C/ttYPnzvdIaeuxRHeJYIm7fTLsQwrBTFANTXGuk6d0Lvpls/J?= =?us-ascii?Q?gF0JMYrN0YuJxuB9DJkAYAZYQHLD0MGmjd5/xBzdyW4zQM6AwIt4MSR7v5zX?= =?us-ascii?Q?ll2couN7kO4QLjJ03jBSNBC18NBlAhRrSuAcQuRkPMlxKn+Fi4ibNNtuoPF/?= =?us-ascii?Q?dECg0OY6XIPLFWddp/OAnYntDwCes3gXE7fKsj6lMKe6lSNLacqdKAAJC0OG?= =?us-ascii?Q?4NEnUiVie9cWOLlnKVXIMytUrjp2Np+kIIGxMSkLc3jitxeNFGxoZUjde+nt?= =?us-ascii?Q?NpZg1yAfCRunVAbjiOVJ3LvJpoWL6sohZIOpeUPDJydKcUU+nzovaL5TB/4K?= =?us-ascii?Q?rTUkONncn19YeEiqVoh+g5kW/8PWdVu0SnFY0OrRs3mF8xFhqScPTJpVjLGO?= =?us-ascii?Q?oC+uGJej2wb5bSJuwC1RtXWR87TLoEofE4RYIiOHqYkKlWX2FGuGZ1/x/Dx4?= =?us-ascii?Q?rjbFk8c1a3qnTD+VDGL+ZdyOT7gHnNYYKt8WhGyXJvyFVlgE5y9Bpt++lziD?= =?us-ascii?Q?jMajkPqVPtNzLc4oJZSPJ5eVEE4ghKjKHUlRVK3YTnReQBcnwuHDEOZ3TNnJ?= =?us-ascii?Q?jJVIB0OkYp2dwQ2tzInIsW+nrs3UL8luWNkFOtXqXyhNM/qXk84aQMMU6AIb?= =?us-ascii?Q?snZazxr+r1KQhULpBRm+nE80WzhjBjmz4saghevGCfYtXhr58FjNqtXf0rRy?= =?us-ascii?Q?8XOPO4o1Cc3ddRKZX13+9jKYsWxIvF1X/oV/UTmCmZypPoBqFnFFnlPSiKKU?= =?us-ascii?Q?71Z6oQdjgAQphioJBAyABMMd0hTmGXLdOdQnsRzD1/gS5DPy30qENBTP8MEQ?= =?us-ascii?Q?+uTlJ89TGSSDp0J49diCDJWJucbRYMIILtUtw03LIbPBDQcC2SF36dU/9rMK?= =?us-ascii?Q?S9Ky5Oz1h6+MMv07IoRK6nmx+gYqkje3jRxnQqXPrQlE5z20cUZp/DBsfCKQ?= =?us-ascii?Q?PvSjOc5WD3AGBg+L3jIoCguUNTKAOCbPcwGuVNLxZKN3yarrOtRQVhthP8sy?= =?us-ascii?Q?vHoc1pBqHgSlB4Mw7AN8Hr6cIfiqBhzad5EVxu7WiHqxOP1mI02+Fj2KmwHn?= =?us-ascii?Q?bwqz5Obj7OCOvKg1Qm3DrFd7g4hD4Txwwe946wOlwk2deQguLcxxQtROKimY?= =?us-ascii?Q?nQfhh0dUYFXAtRmsbpRjMzpxO9bZqhrw/13Mjpe9vk/DkVGupE2IWn4Rt+qv?= =?us-ascii?Q?Y5KVMFgES9nHTlkgcsL0A1rt2yMuQfslQBh6XEOXE6cFEyVBCXqkbpsixxnb?= =?us-ascii?Q?AjEuDwmEgDoubr8Y+gW0KLX22kt8peeIG8sYQasU6QpUi3t5+nk7bwS780u4?= =?us-ascii?Q?ScxxY5dDyEsOxNihs9dikwGv8kDnTVGcceczQIboY1QEKCaMVw=3D=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(36860700013)(82310400026)(1800799024)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Nov 2024 06:40:51.9833 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7410d186-61f4-430d-dcf3-08dd021bc94e X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: SN1PEPF00026368.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9409 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 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 --- >From b2d1e9cfcd735986ffef0ec88d604971a8172708 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 Cc: Xueming Li [ 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/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' 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 + +[ upstream commit 2909f9afbfd1b54ace204d40d57b68e6058aca28 ] @@ -17 +19,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 3893b127dd..5a8de16fe0 100644 +index 62abcb6fe3..3d28bd2af5 100644