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 471B743E57 for ; Sat, 13 Apr 2024 14:56:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 41FC940DDD; Sat, 13 Apr 2024 14:56:57 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2051.outbound.protection.outlook.com [40.107.212.51]) by mails.dpdk.org (Postfix) with ESMTP id 2AB2140294 for ; Sat, 13 Apr 2024 14:56:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NtyC1FsIGzMiD1/iHheBrcwcgIWhJbnk5mS5C5tvr/ozSg0PewfVtFXIE6Aq/oIv44fPuOpYJPQrXzeUe7IO/pQ6DPGoaxjebyAs2PZWo3HqEWbYoLAlxpdt1ujPbv6dVAsh/6enFOf9J4jgjVDgSBDCTjUbU8LajBu6/YOlW8jZibIZ9BdzffeROg5HPpwSvfT4krBSAOhCL5//6NyzyAVAT5hS4yoIOohDQDNgfGVBo4jSHHqqqpnf4VUW8L4xdilu5l1c4bkrFsIGGgx3WGZCJcZn652XCP9VyZCG+wjcssu0VcYcknOHnESIDQFrRyK3U4g5aWO755IM31LFGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=+c/MyVvfZ+CY8H1Wva08EcxXQKoQKvEbJJLhl7fkzCk=; b=Sw0N/50IUHuBVTtvdLtPnY5U1ZnG96YpVY7MowhtXwivmiYU4b2UsOmDH3eXnhsfjHN9+Mtn68tM1LRRVnfrakI7M/aINeKOsGDufwvQ230Yo/Y6tQAwsWHqOZLJvFBbwoU+4yXm1CFpllkFmESupCebS1x2c8e2oUXoFXwptvi1JYhr/o09jDD9h7VDAIEfUcpemqwAkdgKMY/DcWul6D5GjeU+3zw28Fv1VzrHGjtA+5y7gLB2rTCqxUVCoGZZfM+UyIDH1aBalxc74lSoQc9UEcEjyWlx+Y4QFFbUK3rnj1R8yuSLPMEP0mnmVmhpgUGQl1hEdj2BxY5IiNzGFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=+c/MyVvfZ+CY8H1Wva08EcxXQKoQKvEbJJLhl7fkzCk=; b=XCOzzQV27hwK9WeXdmo3z7xenzZfQQSPhQMcS0y8KRyjN5v73gNnOwwRf/lMsrdrHi4w2uoS+60jSNKXX2jqcgt8OUDNTPojoVG0A+kjMmWrHyHPOu71Km2qro8v/U4rKYKZ57WKRmJVRigLkuTJeoBX3l6y8/auIBSnEQzXIciOLGsygI/i0gZlfJX6+qC81C2vGFC/7KdvCSXQ2Mx7R1NbUHSlsG2l3TbVz4q6gJB3jMfXlqaod0KB2CFw35o0A+QANMXUkkPIkrvuwdC4qAwtsuTEU3pgXLg5rLNFlJabcGXSPLHxo+TTOmkpTpDBLKCBukPNVptjkQfnjYo//A== Received: from BYAPR01CA0045.prod.exchangelabs.com (2603:10b6:a03:94::22) by SA0PR12MB4383.namprd12.prod.outlook.com (2603:10b6:806:94::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.55; Sat, 13 Apr 2024 12:56:53 +0000 Received: from MWH0EPF000A6730.namprd04.prod.outlook.com (2603:10b6:a03:94:cafe::eb) by BYAPR01CA0045.outlook.office365.com (2603:10b6:a03:94::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.31 via Frontend Transport; Sat, 13 Apr 2024 12:56:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MWH0EPF000A6730.mail.protection.outlook.com (10.167.249.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:56:53 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:56:44 -0700 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.1258.12; Sat, 13 Apr 2024 05:56:43 -0700 From: Xueming Li To: Robin Jarry CC: David Marchand , dpdk stable Subject: patch 'build: pass cflags in subproject' has been queued to stable release 23.11.1 Date: Sat, 13 Apr 2024 20:49:14 +0800 Message-ID: <20240413125005.725659-74-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-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: 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: MWH0EPF000A6730:EE_|SA0PR12MB4383:EE_ X-MS-Office365-Filtering-Correlation-Id: 44cbe202-2194-4d1f-a84c-08dc5bb9312b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: xWYLZPe8GuD/uZph9T6sR0aIGWMNLYr12yxRxI3xEAebqukJqmnxBihk9M5k1kzLiGNwC2+Be6lEN/lUjzLD17AtTlAVTGyhEkkSeJwjfqeSizEZtc6pv478UcPM+Ep/eoeEFE/pqO1WqKSY+Teflr4r7hIGrWPM0Gq5Z22/4D+J5kV7Tc7oO+ZNjE+ZkI5YhdKjJGn3FhSm8ydqgYTeREq+T4G3BcEqD4YgbdzDF9pIvNeGuK1QHBFyy/VV03smiwNEIAloGfqaN6m+SgPfgGGWCywmwYLSWDFFEf9qxFLoAKczCItNQgYl8QdwKXRRH1xIQIGOH/JK/3xnzilGB6HSMYvhRTiTDBgryACw7CMNbrAoJBvgYfxdH+PdwBoja6kvTy641WvQKSeCuC703S9S9wNre5ksqFIsaHIk/ahRK/J6f4+lK1rpYFq75815oSIZRwSXRx/Q3vvinQdiYbghdLOSaDYg6A5VKugXLSgtY94cxApyqgImdmoTmmhr1ago9SLxYZBvGfJm8FjcaT52AhhlEnE8VeVPEBBSU5uT3cchYNzQ107azi1OS+oyp1rU+MuVz5NQcRyib/mTfZ23Uicsjotx1JQT6+Rdz3BOChPx+sAEIzV36O0umxnH5Oe7kgqa+6rQGlSZzshCSincN2od6QcCq6dnGPbrrU0TYPhtQQK0lJLStFjoPkRYwlgNRpGYQEs7cLceM/Z5CsCIxhkI9uanIIbiW1k+rtdfHY0UkOYcAlSt8dZVn5MF X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(1800799015)(376005)(36860700004)(82310400014); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:56:53.1008 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 44cbe202-2194-4d1f-a84c-08dc5bb9312b 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000A6730.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4383 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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=9796ac2ab87502888fc1a1d7252233d132b6ae41 Thanks. Xueming Li --- >From 9796ac2ab87502888fc1a1d7252233d132b6ae41 Mon Sep 17 00:00:00 2001 From: Robin Jarry Date: Fri, 8 Mar 2024 12:58:40 +0100 Subject: [PATCH] build: pass cflags in subproject Cc: Xueming Li [ upstream commit 3f9aa55632bd272981471516608a7eaf543bea37 ] When DPDK is used as a subproject, include the required compile arguments so that the parent project is also built with the appropriate cflags (most importantly -march). Use the same cflags as pkg-config. Fixes: f93a605f2d6e ("build: add definitions for use as Meson subproject") Signed-off-by: Robin Jarry Reviewed-by: David Marchand --- buildtools/subproject/meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/buildtools/subproject/meson.build b/buildtools/subproject/meson.build index 322e01c029..203c5d36c6 100644 --- a/buildtools/subproject/meson.build +++ b/buildtools/subproject/meson.build @@ -2,10 +2,15 @@ # Copyright(c) 2022 Intel Corporation message('DPDK subproject linking: ' + get_option('default_library')) +subproject_cflags = ['-include', 'rte_config.h'] + machine_args +if is_freebsd + subproject_cflags += ['-D__BSD_VISIBLE'] +endif if get_option('default_library') == 'static' dpdk_dep = declare_dependency( version: meson.project_version(), dependencies: dpdk_static_lib_deps, + compile_args: subproject_cflags, # static library deps in DPDK build don't include "link_with" parameters, # so explicitly link-in both libs and drivers link_whole: dpdk_static_libraries + dpdk_drivers, @@ -13,6 +18,7 @@ if get_option('default_library') == 'static' else dpdk_dep = declare_dependency( version: meson.project_version(), + compile_args: subproject_cflags, # shared library deps include all necessary linking parameters dependencies: dpdk_shared_lib_deps) endif -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:07.277467454 +0800 +++ 0074-build-pass-cflags-in-subproject.patch 2024-04-13 20:43:05.027753892 +0800 @@ -1 +1 @@ -From 3f9aa55632bd272981471516608a7eaf543bea37 Mon Sep 17 00:00:00 2001 +From 9796ac2ab87502888fc1a1d7252233d132b6ae41 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3f9aa55632bd272981471516608a7eaf543bea37 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org