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 775E5457A1 for ; Mon, 12 Aug 2024 14:51:29 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 718C9402C3; Mon, 12 Aug 2024 14:51:29 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2062.outbound.protection.outlook.com [40.107.237.62]) by mails.dpdk.org (Postfix) with ESMTP id 2FA504029C for ; Mon, 12 Aug 2024 14:51:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vJFHLi3TLUFihMpqPLsUOKb7InPk7+bkiiMUs4o/8dXzyNwxcuiWoJBqQsPx8zpHQsM7Px/f1z9CSvehXAlQeWFTrP76HUP8V+ln1UOdp+L5uH3gfk4Wa9n6jUDWEl/W3Q0h8GXnRXTae/WhCYNg7ZCQd96k9L9d6f9EoYdMQg+q+oFQIxKDytAgWol7PGlksRO4f9mBSVVn2SppICVCf1p6c0tpUiUwOzKszLGLvW6L7ZvMgLSog2S36BZM1Lieh3FkQhS0Natpa4iootCJ+66yHf7RPFl+0H//NEKHGqwmjaDLjwV1tcMIK+cV2sDbFcT+o9lKwSz55y3QMsUzXw== 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=7hvUOOlSn6is84zECv+2M6QOFLvttfXOMyDX3UH+9VU=; b=QF51zXpdXzkrYxvG5ITidOrqUJgVko4qBv2v7Wy252f3pzF3maG7igOPSq6gQT8h1kRuJhoA4JrJfQ4L8VpqqZqN+VKV+uEAkynlYqIKfcLqpP99kkWkwv/AUXA2pBuSK3gbTbYMRD5EmYa18cGvIKQTr/ffcZ0mQQ6keRs15dqmKmlDqCWsXIuQP103eTU5Jw2euQm/NrHylil+PF/0OmJdsR69zeiIoMIwUyORidp80HA+ahjZiIkufttWUQq0o6wkY24vmhDmpRtrw71CAEpIeI2n9ElLC0HcAYibxUqIPxP9f1o3sInVdzP2xzws0tlFXj/z31I6G4vFj0C1Aw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.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=7hvUOOlSn6is84zECv+2M6QOFLvttfXOMyDX3UH+9VU=; b=ZVjx491tKVYvPeqwHINu4pUMSy+lOoCZ02sV0ke5zAFF8VvZ4pfDIa0m1ReZI9f4dmBufHmvDkWPfvjsJV8gEId5q/VWmuYVwUkiidzitRJYPEODgcAMm0RClmAFbx3YAv33ejpLN4Gqr9o2NyzVVWRE1lL50jzIlN8cRtXWB3n0bou2ZKlUCPmAubbfiG8Bwwa/SBEvzV4NBBv1Pub/aoD0y3k6u3n4l3rWpwYv59Vs0JWXErj7sOBFVOmAuT/2U2jl5bdmG6fiONUYil1MDx6j4+m3RedPd0VViQe1ZUbv8xlboIRxlevKJ4wzc0CMP3jh2qvRqGXY/izfEFD3Jw== Received: from CH2PR07CA0031.namprd07.prod.outlook.com (2603:10b6:610:20::44) by CY8PR12MB8338.namprd12.prod.outlook.com (2603:10b6:930:7b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22; Mon, 12 Aug 2024 12:51:23 +0000 Received: from DS2PEPF00003441.namprd04.prod.outlook.com (2603:10b6:610:20:cafe::69) by CH2PR07CA0031.outlook.office365.com (2603:10b6:610:20::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.22 via Frontend Transport; Mon, 12 Aug 2024 12:51:23 +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 DS2PEPF00003441.mail.protection.outlook.com (10.167.17.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7849.8 via Frontend Transport; Mon, 12 Aug 2024 12:51:22 +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; Mon, 12 Aug 2024 05:51:03 -0700 Received: from nvidia.com (10.126.230.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; Mon, 12 Aug 2024 05:51:01 -0700 From: Xueming Li To: David Marchand CC: , Bruce Richardson , Ruifeng Wang , dpdk stable Subject: patch 'config: fix warning for cross build with meson >= 1.3.0' has been queued to stable release 23.11.2 Date: Mon, 12 Aug 2024 20:47:58 +0800 Message-ID: <20240812125035.389667-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240812125035.389667-1-xuemingl@nvidia.com> References: <20240712110153.309690-23-xuemingl@nvidia.com> <20240812125035.389667-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003441:EE_|CY8PR12MB8338:EE_ X-MS-Office365-Filtering-Correlation-Id: 8a11cec1-fc7c-4e16-1341-08dcbacd786d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|36860700013|1800799024|82310400026|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?EzKjdY2+9yANsOiqidXdg6F1ICqbnG5A61aWBGpo6jWX1d19CkmNPZfFOIwE?= =?us-ascii?Q?zNRmooLlTMa4fK4KIP0QKmo4hnjmqyA4sJ16JaMqnI5s1f6XwERRoHn0HV7c?= =?us-ascii?Q?a4xTEHloitaMVCuXYlUFOhRSxK2WzJalslQY79aGPP1lf6BYqZNrTG/z8yIw?= =?us-ascii?Q?6t9usR2AoP70POkBKOlb3MhbeJtUNrB7dFOsKCwzrHKp91uqpeawRfTaI4O7?= =?us-ascii?Q?rGwIKNVbnA+L2dKyg9MH3Z8cdtc9m8Qmei4q19iVBkLqpPnmOLJ5WTpujfKq?= =?us-ascii?Q?sLviH8Uh77aJ3E0ZhzD3+YUw89fBAUEAa+EDl0LlmPSuAe6iRw9p2dVNAqfy?= =?us-ascii?Q?dKq8/BuSsIOaJFSkiPzamRqaVKOUTn4Hh0cuVk4BFM9kOFMvLkd0GtqV2UJP?= =?us-ascii?Q?eFozp1Zj4WbOYiJoudm4bDNBLzGEwvZubXGE7A1xJyASIRM/NTBMRt4SLxa/?= =?us-ascii?Q?jrkCOX18RlXXpwHpvhb5b25jqI5qSz6LaF1328yNetv6PW2892fTLg/7S3fK?= =?us-ascii?Q?ufX0RSiWf3cop+CxgiTbxtLbb7qeF+UCpgrk1+fRxvNwlChVl6ZacIfJrrcl?= =?us-ascii?Q?hnlQZQDW2cBABty/4bngoIaqNNC15eIDgOayO6J/cjo5/xkrO0M7eF8yzQOy?= =?us-ascii?Q?GXG5PwEkXfXZAMkQbF/eMnLN+Hlmew2xGOSnkrLeDGOLW+Om0NHA0WKyuZax?= =?us-ascii?Q?T86OA6MwBAXZdUCD2SoBJg8Gb0lvUvYi763evQDSjLj4orqCUbuCn7bq3WCp?= =?us-ascii?Q?bhmMsoQxf6bZ2h7PMIaBBNJYtqWtmNS7o4HJwELbPKkPvw0F1Wim2UtjDpVX?= =?us-ascii?Q?cpyEW7hwoxHE6hdn61tkPpgaa7KE/0DO8+xgFZLXtXuB7WHL1lx3Nwoywow1?= =?us-ascii?Q?Dafurf8oreqPFxyPfbEub2T5/ERqjph9DNv5ODh8ZYFK9iP3GTtpQUUR2jST?= =?us-ascii?Q?kfVN+TTo5Y8A+MnRjtzr2Y5VMnrQ2Fp/qEUvqev3J4ojsWzBnt6cGtjLD/85?= =?us-ascii?Q?k2n4cnDCwVLmxmkjtT9LCVbaSVSeGqH430TKdmTfwTxvpPnUEyWa1Li1Lv/M?= =?us-ascii?Q?kWKORtSKDV/de7hz0Dc0dbqV0gZqRzqH1y+jhBJi2hXVmmxNG8QM2Dl1TT4+?= =?us-ascii?Q?tCY1DTPOIjBt1appVRljQvOM75Fay0PGouZZhoRIvBstjz1i9mKgFEmwWv+u?= =?us-ascii?Q?vEND65/Qks+lwxGpzFGjRtufkl1mIymgR9YWQPsrRAOoa/dnfESHz6JUIATq?= =?us-ascii?Q?vKlem24zpu7dr2bBkpW6JNXawH1Vt5Ia/JR2qmTICeiS2miw7FHFriX46ssS?= =?us-ascii?Q?Yzh2zcsrRc7PWzBqmP+Ib/wkN8p+S82hNAHUpPVSEk4SF+JzF74mPH72z+kI?= =?us-ascii?Q?cWdhWvMMv6BreQOXqzaF+S7HERtqhO8tHaSomAlqUB4cR5SB6k/Ts+PClvhH?= =?us-ascii?Q?TRB7onBQDqT1GitnJrawbpL26thFc7TX?= 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)(1800799024)(82310400026)(376014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2024 12:51:22.9056 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a11cec1-fc7c-4e16-1341-08dcbacd786d 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: DS2PEPF00003441.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8338 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/14/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=edfa6a87c8e3d2fad2ab15d40ddbd2f403212576 Thanks. Xueming Li --- >From edfa6a87c8e3d2fad2ab15d40ddbd2f403212576 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Mon, 17 Jun 2024 17:05:18 +0200 Subject: [PATCH] config: fix warning for cross build with meson >= 1.3.0 Cc: Xueming Li [ upstream commit be4c001bd67864981103fa98c3375c601778852e ] Starting meson 1.3.0, the pkgconfig variable is deprecated in favor of pkg-config. Keep both variables as suggested in meson RN. Link: https://mesonbuild.com/Release-notes-for-1-3-0.html#machine-files-pkgconfig-field-deprecated-and-replaced-by-pkgconfig Signed-off-by: David Marchand Acked-by: Bruce Richardson Acked-by: Ruifeng Wang --- config/arm/arm32_armv8_linux_gcc | 1 + config/arm/arm64_altra_linux_gcc | 1 + config/arm/arm64_ampereone_linux_gcc | 1 + config/arm/arm64_armada_linux_gcc | 1 + config/arm/arm64_armv8_linux_clang_ubuntu | 1 + config/arm/arm64_armv8_linux_gcc | 1 + config/arm/arm64_bluefield3_linux_gcc | 1 + config/arm/arm64_bluefield_linux_gcc | 1 + config/arm/arm64_cdx_linux_gcc | 1 + config/arm/arm64_centriq2400_linux_gcc | 1 + config/arm/arm64_cn10k_linux_gcc | 1 + config/arm/arm64_cn9k_linux_gcc | 1 + config/arm/arm64_dpaa_linux_gcc | 1 + config/arm/arm64_emag_linux_gcc | 1 + config/arm/arm64_ft2000plus_linux_gcc | 1 + config/arm/arm64_graviton2_linux_gcc | 1 + config/arm/arm64_graviton3_linux_gcc | 1 + config/arm/arm64_hip10_linux_gcc | 1 + config/arm/arm64_kunpeng920_linux_gcc | 1 + config/arm/arm64_kunpeng930_linux_gcc | 1 + config/arm/arm64_n1sdp_linux_gcc | 1 + config/arm/arm64_n2_linux_gcc | 1 + config/arm/arm64_stingray_linux_gcc | 1 + config/arm/arm64_thunderx2_linux_gcc | 1 + config/arm/arm64_thunderxt83_linux_gcc | 1 + config/arm/arm64_thunderxt88_linux_gcc | 1 + config/arm/arm64_tys2500_linux_gcc | 1 + config/x86/cross-mingw | 1 + 28 files changed, 28 insertions(+) diff --git a/config/arm/arm32_armv8_linux_gcc b/config/arm/arm32_armv8_linux_gcc index 269a60ba19..abcb182b16 100644 --- a/config/arm/arm32_armv8_linux_gcc +++ b/config/arm/arm32_armv8_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'arm-linux-gnueabihf-g++'] ar = 'arm-linux-gnueabihf-gcc-ar' strip = 'arm-linux-gnueabihf-strip' pkgconfig = 'arm-linux-gnueabihf-pkg-config' +pkg-config = 'arm-linux-gnueabihf-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_altra_linux_gcc b/config/arm/arm64_altra_linux_gcc index ce0667ebe2..769503d936 100644 --- a/config/arm/arm64_altra_linux_gcc +++ b/config/arm/arm64_altra_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_ampereone_linux_gcc b/config/arm/arm64_ampereone_linux_gcc index 8964432a74..bb6acfc4cf 100644 --- a/config/arm/arm64_ampereone_linux_gcc +++ b/config/arm/arm64_ampereone_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_armada_linux_gcc b/config/arm/arm64_armada_linux_gcc index 635b4946a3..8f36d895da 100644 --- a/config/arm/arm64_armada_linux_gcc +++ b/config/arm/arm64_armada_linux_gcc @@ -5,6 +5,7 @@ ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_armv8_linux_clang_ubuntu b/config/arm/arm64_armv8_linux_clang_ubuntu index 86ae43937b..e34fabebe5 100644 --- a/config/arm/arm64_armv8_linux_clang_ubuntu +++ b/config/arm/arm64_armv8_linux_clang_ubuntu @@ -6,6 +6,7 @@ strip = 'llvm-strip' llvm-config = 'llvm-config' pcap-config = 'llvm-config' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' [host_machine] system = 'linux' diff --git a/config/arm/arm64_armv8_linux_gcc b/config/arm/arm64_armv8_linux_gcc index 529694b49d..a9b136cf48 100644 --- a/config/arm/arm64_armv8_linux_gcc +++ b/config/arm/arm64_armv8_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_bluefield3_linux_gcc b/config/arm/arm64_bluefield3_linux_gcc index 775cf5883d..d900e72a6d 100644 --- a/config/arm/arm64_bluefield3_linux_gcc +++ b/config/arm/arm64_bluefield3_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_bluefield_linux_gcc b/config/arm/arm64_bluefield_linux_gcc index 1286227915..bcffb6534b 100644 --- a/config/arm/arm64_bluefield_linux_gcc +++ b/config/arm/arm64_bluefield_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_cdx_linux_gcc b/config/arm/arm64_cdx_linux_gcc index 8e6d619dae..bf494b776e 100644 --- a/config/arm/arm64_cdx_linux_gcc +++ b/config/arm/arm64_cdx_linux_gcc @@ -5,6 +5,7 @@ ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_centriq2400_linux_gcc b/config/arm/arm64_centriq2400_linux_gcc index bc8737e072..33cb5ef675 100644 --- a/config/arm/arm64_centriq2400_linux_gcc +++ b/config/arm/arm64_centriq2400_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_cn10k_linux_gcc b/config/arm/arm64_cn10k_linux_gcc index fa904af5d0..63fcca9cbe 100644 --- a/config/arm/arm64_cn10k_linux_gcc +++ b/config/arm/arm64_cn10k_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' cmake = 'cmake' diff --git a/config/arm/arm64_cn9k_linux_gcc b/config/arm/arm64_cn9k_linux_gcc index 646ce4b5d3..fa4618e370 100644 --- a/config/arm/arm64_cn9k_linux_gcc +++ b/config/arm/arm64_cn9k_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' cmake = 'cmake' diff --git a/config/arm/arm64_dpaa_linux_gcc b/config/arm/arm64_dpaa_linux_gcc index 8465b5097b..bf0eab18e2 100644 --- a/config/arm/arm64_dpaa_linux_gcc +++ b/config/arm/arm64_dpaa_linux_gcc @@ -5,6 +5,7 @@ ar = 'aarch64-linux-gnu-ar' as = 'aarch64-linux-gnu-as' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_emag_linux_gcc b/config/arm/arm64_emag_linux_gcc index 248169ed68..3e8c15f8a4 100644 --- a/config/arm/arm64_emag_linux_gcc +++ b/config/arm/arm64_emag_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_ft2000plus_linux_gcc b/config/arm/arm64_ft2000plus_linux_gcc index ae9f779056..4ecb251d3f 100644 --- a/config/arm/arm64_ft2000plus_linux_gcc +++ b/config/arm/arm64_ft2000plus_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_graviton2_linux_gcc b/config/arm/arm64_graviton2_linux_gcc index fdb298bb11..b5f681bc27 100644 --- a/config/arm/arm64_graviton2_linux_gcc +++ b/config/arm/arm64_graviton2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_graviton3_linux_gcc b/config/arm/arm64_graviton3_linux_gcc index 19b422075d..77b5168836 100644 --- a/config/arm/arm64_graviton3_linux_gcc +++ b/config/arm/arm64_graviton3_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_hip10_linux_gcc b/config/arm/arm64_hip10_linux_gcc index 2943e4abbf..85bcd05887 100644 --- a/config/arm/arm64_hip10_linux_gcc +++ b/config/arm/arm64_hip10_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_kunpeng920_linux_gcc b/config/arm/arm64_kunpeng920_linux_gcc index 193fb48a61..6e7d8ac667 100644 --- a/config/arm/arm64_kunpeng920_linux_gcc +++ b/config/arm/arm64_kunpeng920_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_kunpeng930_linux_gcc b/config/arm/arm64_kunpeng930_linux_gcc index e4281ceb4f..61fe482a2e 100644 --- a/config/arm/arm64_kunpeng930_linux_gcc +++ b/config/arm/arm64_kunpeng930_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_n1sdp_linux_gcc b/config/arm/arm64_n1sdp_linux_gcc index 2806a4241b..c3c12098d8 100644 --- a/config/arm/arm64_n1sdp_linux_gcc +++ b/config/arm/arm64_n1sdp_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_n2_linux_gcc b/config/arm/arm64_n2_linux_gcc index 7404bd197b..89200861c4 100644 --- a/config/arm/arm64_n2_linux_gcc +++ b/config/arm/arm64_n2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_stingray_linux_gcc b/config/arm/arm64_stingray_linux_gcc index 08148b5c3d..358f3b43d3 100644 --- a/config/arm/arm64_stingray_linux_gcc +++ b/config/arm/arm64_stingray_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_thunderx2_linux_gcc b/config/arm/arm64_thunderx2_linux_gcc index 32ae938e95..124a97da01 100644 --- a/config/arm/arm64_thunderx2_linux_gcc +++ b/config/arm/arm64_thunderx2_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_thunderxt83_linux_gcc b/config/arm/arm64_thunderxt83_linux_gcc index e9d9e62d44..433c3cb4e3 100644 --- a/config/arm/arm64_thunderxt83_linux_gcc +++ b/config/arm/arm64_thunderxt83_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_thunderxt88_linux_gcc b/config/arm/arm64_thunderxt88_linux_gcc index c6e5a5656a..81975aea14 100644 --- a/config/arm/arm64_thunderxt88_linux_gcc +++ b/config/arm/arm64_thunderxt88_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/arm/arm64_tys2500_linux_gcc b/config/arm/arm64_tys2500_linux_gcc index fce85fb0d8..24e6539a15 100644 --- a/config/arm/arm64_tys2500_linux_gcc +++ b/config/arm/arm64_tys2500_linux_gcc @@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] ar = 'aarch64-linux-gnu-gcc-ar' strip = 'aarch64-linux-gnu-strip' pkgconfig = 'aarch64-linux-gnu-pkg-config' +pkg-config = 'aarch64-linux-gnu-pkg-config' pcap-config = '' [host_machine] diff --git a/config/x86/cross-mingw b/config/x86/cross-mingw index cddebda5b5..11597eaa26 100644 --- a/config/x86/cross-mingw +++ b/config/x86/cross-mingw @@ -5,6 +5,7 @@ ld = 'x86_64-w64-mingw32-ld' ar = 'x86_64-w64-mingw32-ar' strip = 'x86_64-w64-mingw32-strip' pkgconfig = 'x86_64-w64-mingw32-pkg-config' +pkg-config = 'x86_64-w64-mingw32-pkg-config' objdump = 'x86_64-w64-mingw32-objdump' [host_machine] -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-08-12 20:44:02.695764712 +0800 +++ 0001-config-fix-warning-for-cross-build-with-meson-1.3.0.patch 2024-08-12 20:44:01.875069251 +0800 @@ -1 +1 @@ -From be4c001bd67864981103fa98c3375c601778852e Mon Sep 17 00:00:00 2001 +From edfa6a87c8e3d2fad2ab15d40ddbd2f403212576 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit be4c001bd67864981103fa98c3375c601778852e ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -24 +25,0 @@ - config/arm/arm64_capri_linux_gcc | 1 + @@ -30 +30,0 @@ - config/arm/arm64_elba_linux_gcc | 1 + @@ -33 +32,0 @@ - config/arm/arm64_grace_linux_gcc | 1 + @@ -36 +34,0 @@ - config/arm/arm64_graviton4_linux_gcc | 1 + @@ -42 +39,0 @@ - config/arm/arm64_odyssey_linux_gcc | 1 + @@ -48 +44,0 @@ - config/arm/arm64_v2_linux_gcc | 1 + @@ -50 +46 @@ - 34 files changed, 34 insertions(+) + 28 files changed, 28 insertions(+) @@ -148,12 +143,0 @@ -diff --git a/config/arm/arm64_capri_linux_gcc b/config/arm/arm64_capri_linux_gcc -index 1a6313e684..5099ec66a5 100644 ---- a/config/arm/arm64_capri_linux_gcc -+++ b/config/arm/arm64_capri_linux_gcc -@@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] - ar = 'aarch64-linux-gnu-gcc-ar' - strip = 'aarch64-linux-gnu-strip' - pkgconfig = 'aarch64-linux-gnu-pkg-config' -+pkg-config = 'aarch64-linux-gnu-pkg-config' - pcap-config = '' - - [host_machine] @@ -220,12 +203,0 @@ -diff --git a/config/arm/arm64_elba_linux_gcc b/config/arm/arm64_elba_linux_gcc -index 4d891bd5a7..624a821adb 100644 ---- a/config/arm/arm64_elba_linux_gcc -+++ b/config/arm/arm64_elba_linux_gcc -@@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] - ar = 'aarch64-linux-gnu-gcc-ar' - strip = 'aarch64-linux-gnu-strip' - pkgconfig = 'aarch64-linux-gnu-pkg-config' -+pkg-config = 'aarch64-linux-gnu-pkg-config' - pcap-config = '' - - [host_machine] @@ -256,12 +227,0 @@ -diff --git a/config/arm/arm64_grace_linux_gcc b/config/arm/arm64_grace_linux_gcc -index bde55b17a8..81e56674f6 100644 ---- a/config/arm/arm64_grace_linux_gcc -+++ b/config/arm/arm64_grace_linux_gcc -@@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] - ar = 'aarch64-linux-gnu-gcc-ar' - strip = 'aarch64-linux-gnu-strip' - pkgconfig = 'aarch64-linux-gnu-pkg-config' -+pkg-config = 'aarch64-linux-gnu-pkg-config' - pcap-config = '' - - [host_machine] @@ -292,12 +251,0 @@ -diff --git a/config/arm/arm64_graviton4_linux_gcc b/config/arm/arm64_graviton4_linux_gcc -index 839224bca7..3b674f7800 100644 ---- a/config/arm/arm64_graviton4_linux_gcc -+++ b/config/arm/arm64_graviton4_linux_gcc -@@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] - ar = 'aarch64-linux-gnu-gcc-ar' - strip = 'aarch64-linux-gnu-strip' - pkgconfig = 'aarch64-linux-gnu-pkg-config' -+pkg-config = 'aarch64-linux-gnu-pkg-config' - pcap-config = '' - - [host_machine] @@ -364,12 +311,0 @@ -diff --git a/config/arm/arm64_odyssey_linux_gcc b/config/arm/arm64_odyssey_linux_gcc -index 532c708bde..9cd49b5717 100644 ---- a/config/arm/arm64_odyssey_linux_gcc -+++ b/config/arm/arm64_odyssey_linux_gcc -@@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-marvell-linux-gnu-g++'] - ar = 'aarch64-marvell-linux-gnu-gcc-ar' - strip = 'aarch64-marvell-linux-gnu-strip' - pkgconfig = 'aarch64-linux-gnu-pkg-config' -+pkg-config = 'aarch64-linux-gnu-pkg-config' - - [host_machine] - system = 'linux' @@ -428,12 +363,0 @@ -@@ -4,6 +4,7 @@ cpp = ['ccache', 'aarch64-linux-gnu-g++'] - ar = 'aarch64-linux-gnu-gcc-ar' - strip = 'aarch64-linux-gnu-strip' - pkgconfig = 'aarch64-linux-gnu-pkg-config' -+pkg-config = 'aarch64-linux-gnu-pkg-config' - pcap-config = '' - - [host_machine] -diff --git a/config/arm/arm64_v2_linux_gcc b/config/arm/arm64_v2_linux_gcc -index 50d9be3da3..f27eeead66 100644 ---- a/config/arm/arm64_v2_linux_gcc -+++ b/config/arm/arm64_v2_linux_gcc