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 C3175433D8 for ; Mon, 11 Dec 2023 11:18:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD5B840ED2; Mon, 11 Dec 2023 11:18:30 +0100 (CET) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2086.outbound.protection.outlook.com [40.107.101.86]) by mails.dpdk.org (Postfix) with ESMTP id 1DCF340E0F for ; Mon, 11 Dec 2023 11:18:29 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TYPrN4ftE65+520vPMWJiuwAKI8rwQ7/1LWZ4gJlaElZQmzssWAkCI0TnfqKtce6eHrfA1A5Jgznn8tb4Wv3M/uHBvE+I5QRVlRV2fXbcl2R/FkT1hG0aonp+q4V3laBXZDuHR8YTrrXi1YzlPRUwAaWPZkg/n8dx1AsLVPQkgonA85Bgq8f5pcZu6wmxw5IHaDzVi4UJISXC+Y9GXdqBonV1xkzyInrKTUnWcU1Wvx8uvBy6SAI+ybwf51A5P0Do8c8fUM3ROR52J3sS9GIC6MyQKOpZxJ+3SqKgEKrL/BXoSWwaR9oDTVGoYQCNQo0ntzOrz9ARK9m7GdaxzsSdw== 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=QUY6EmmHcDWw/33Zk/QMUZiukg2ryE2clNqlnDAUd9E=; b=aWtOb1OE3xKNphgjBzMIm1SVN1fOzri/Hrgf4j9j6YegqPyrDW2T485mfdf5z9DIvTwUlkL42REesmhQhRXKKu22QumtoAGNQV2Vcedgv3zYvrbPyzFdLyrxeW4SmcXTFZ2tES5aICIogHmO2KkpvPGY6XGrR3Pyj4+m8Y8Ny6xxI/WHtqw1sxpiqZjGJy8gCbwVqltXtcsjpR1OXU//iFxXdHEpfBR1Tpv089AO4PuLC9Em9dtdGD4In/HwE1s7wQir7KkMCHqpDedGcKlZAGUgGFtAtqp7wutg3nS4zGzQVCq3xODgFCtmbrXlqaQUlYCPvySNmVVy2dh4fnjPtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.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=QUY6EmmHcDWw/33Zk/QMUZiukg2ryE2clNqlnDAUd9E=; b=Mm29UWQwdVLwNbAa4JlbZkjLqMDODUzmIWI3gByS5MyZq0eZpHdSMo9UV0cl+cISMuU66FGXlceyotLQjaPuLYa+TNprxCo8DjGGQOP+5R3n5RsR44fvIy8+0+hqX03f57Ma8kt9eNRZOe+NlefuVdx8zuRdrxGoqK2C1QWqTimu7Jfj5zGBfLc+iodf8hhfX9+wTtuwcnDJyoQg5LyNVVSLitURqsShlahCM9AbrGFeFcxmxRuGPjmagdhcYRGeE/Og/6chehIC3XeXrT7HmrjcNuR1YoMHDI87anXStQHP55XZBG4+DR5ehdTR6+fikx0H+cVW0cg5SiuMIHM0dQ== Received: from CH2PR14CA0004.namprd14.prod.outlook.com (2603:10b6:610:60::14) by BL1PR12MB5705.namprd12.prod.outlook.com (2603:10b6:208:384::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:18:24 +0000 Received: from DS3PEPF000099E2.namprd04.prod.outlook.com (2603:10b6:610:60:cafe::9b) by CH2PR14CA0004.outlook.office365.com (2603:10b6:610:60::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:18:24 +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 DS3PEPF000099E2.mail.protection.outlook.com (10.167.17.201) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:18:24 +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.986.41; Mon, 11 Dec 2023 02:18:13 -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.986.41; Mon, 11 Dec 2023 02:18:12 -0800 From: Xueming Li To: Srikanth Yalavarthi CC: Bruce Richardson , dpdk stable Subject: patch 'build: add libarchive to optional external dependencies' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:29 +0800 Message-ID: <20231211101226.2122-65-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: DS3PEPF000099E2:EE_|BL1PR12MB5705:EE_ X-MS-Office365-Filtering-Correlation-Id: 199bfb4d-a001-4af8-35a7-08dbfa32824f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gDGUn6xwNjfyeSx9frPJyzMmjGTaZ9l7baJIn5OCKNsuWLwfYtLsRaOTetZuJyxC2fLY8QSxqPaD+r1V89B8FW1Q6gh4Eku6cxcxvvIho+XBjNza4xDGWCnwJyRkSJT/4pFUWyLW3W+XOxehng0iLmcrE5SzgSP2zgL2C6b0vCOHSw3aNOu854zKj4Agr6Pu58SBSufyXnRdIO5LvZpk/QpDispw8xmrGnLidHpz4MTFuFum2K7B6Cb13dfhEowjrFXYHMkanGOc2/32Lo37+CaUMOw2Qu1su1iMp9Ydo1Xwj5EOnaiuH/jmbChHH0fK6y4xr+hf9vOB5AOwII8pijN2k/pV5D+4i/jxaE+mUe1+4X/IXuCBvlpNzxcwVMu2D16RSJLMGz+kj1IQy6VB4gwO0pMBrJsW23YEaUjU8Fb0G4uLgpemxNrkea53z4oSw7De8WGP5A+IDjXMawki8cA1/Q+EuNKXEO6JyDH6K1uLP4gXSfznCe14qIi6FE+ax8r/WbsgGGQGh0JN+mIo/+xfy0i40kZNyiYEKCSn0q3UrYZqQ3zaidoFAdQiadKt8ivAp2PQdGNwbOQ09oLfiCENk/EWC3je22Shu2K4Xmi6/Q7YEIxhKu7M+qhMD7xneAFKKI4UCBCgMnzpY3qmDxaP60UzvAd7P1VVugsuTR2BZOrNerfTndyZonWdEl7oBeq7FFnROMwKxqBj7fva5fw7oja9cqUdLEWDQNecjhKZ6IpQ26SCuG7aKoOZLDY80veHAPRrpnRmDX0Dpp3lWz8wB8O345SsVVKeT2ItDU/M++G4+80KU70J+M2V/nRi5FP6mnR0WZHL47WGY020rQ== 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:(13230031)(4636009)(396003)(346002)(376002)(39860400002)(136003)(230273577357003)(230922051799003)(230173577357003)(1800799012)(451199024)(64100799003)(186009)(82310400011)(46966006)(40470700004)(36840700001)(55016003)(40480700001)(6286002)(1076003)(26005)(426003)(336012)(16526019)(2616005)(40460700003)(82740400003)(36756003)(7636003)(86362001)(356005)(47076005)(83380400001)(5660300002)(53546011)(7696005)(6666004)(36860700001)(316002)(70586007)(70206006)(966005)(8936002)(8676002)(6916009)(54906003)(41300700001)(4001150100001)(4326008)(2906002)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:18:24.3188 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 199bfb4d-a001-4af8-35a7-08dbfa32824f 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: DS3PEPF000099E2.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5705 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 22.11.4 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/13/23. 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=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=dec4b39b200a8c4b835f018c6061e81597e9401c Thanks. Xueming Li --- >From dec4b39b200a8c4b835f018c6061e81597e9401c Mon Sep 17 00:00:00 2001 From: Srikanth Yalavarthi Date: Sun, 5 Nov 2023 20:12:43 -0800 Subject: [PATCH] build: add libarchive to optional external dependencies Cc: Xueming Li [ upstream commit 22f7184e8b5f1b546ac26dd0bde8c3c6038a7e03 ] In order to avoid linking with Libs.private, libarchive is not added to ext_deps during the meson setup stage. Since libarchive is not added to ext_deps, cross-compilation or native compilation with libarchive installed in non-standard location fails with errors related to "cannot find -larchive" or "archive.h: No such file or directory". In order to fix the build failures, user is required to define the 'c_args' and 'c_link_args' with '-I' and '-L'. This patch adds libarchive to ext_deps and further would not require setting c_args and c_link_args externally. Fixes: 40edb9c0d36b ("eal: handle compressed firmware") Signed-off-by: Srikanth Yalavarthi Acked-by: Bruce Richardson --- config/meson.build | 5 ----- lib/eal/meson.build | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/meson.build b/config/meson.build index 7cd375e991..6c59b28468 100644 --- a/config/meson.build +++ b/config/meson.build @@ -209,11 +209,6 @@ dpdk_conf.set('RTE_BACKTRACE', cc.has_header('execinfo.h') or is_windows) libarchive = dependency('libarchive', required: false, method: 'pkg-config') if libarchive.found() dpdk_conf.set('RTE_HAS_LIBARCHIVE', 1) - # Push libarchive link dependency at the project level to support - # statically linking dpdk apps. Details at: - # https://inbox.dpdk.org/dev/20210605004024.660267a1@sovereign/ - add_project_link_arguments('-larchive', language: 'c') - dpdk_extra_ldflags += '-larchive' endif # check for libbsd diff --git a/lib/eal/meson.build b/lib/eal/meson.build index 056beb9461..04bd3fe351 100644 --- a/lib/eal/meson.build +++ b/lib/eal/meson.build @@ -29,6 +29,9 @@ endif if dpdk_conf.has('RTE_USE_LIBBSD') ext_deps += libbsd endif +if dpdk_conf.has('RTE_HAS_LIBARCHIVE') + ext_deps += libarchive +endif if cc.has_function('getentropy', prefix : '#include ') cflags += '-DRTE_LIBEAL_USE_GETENTROPY' endif -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.181989500 +0800 +++ 0064-build-add-libarchive-to-optional-external-dependenci.patch 2023-12-11 17:56:23.067652300 +0800 @@ -1 +1 @@ -From 22f7184e8b5f1b546ac26dd0bde8c3c6038a7e03 Mon Sep 17 00:00:00 2001 +From dec4b39b200a8c4b835f018c6061e81597e9401c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 22f7184e8b5f1b546ac26dd0bde8c3c6038a7e03 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -30 +32 @@ -index 39ed4ba7d3..d732154731 100644 +index 7cd375e991..6c59b28468 100644 @@ -33 +35 @@ -@@ -251,11 +251,6 @@ dpdk_conf.set('RTE_BACKTRACE', cc.has_header('execinfo.h') or is_windows) +@@ -209,11 +209,6 @@ dpdk_conf.set('RTE_BACKTRACE', cc.has_header('execinfo.h') or is_windows) @@ -46 +48 @@ -index 9942104386..e1d6c4cf17 100644 +index 056beb9461..04bd3fe351 100644 @@ -49 +51 @@ -@@ -21,6 +21,9 @@ endif +@@ -29,6 +29,9 @@ endif