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 1F4EDA0A04 for ; Tue, 19 Jan 2021 06:32:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02F9D140D48; Tue, 19 Jan 2021 06:32:07 +0100 (CET) Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-eopbgr130084.outbound.protection.outlook.com [40.107.13.84]) by mails.dpdk.org (Postfix) with ESMTP id 97D6D140D1B; Tue, 19 Jan 2021 06:32:04 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R/XPTxaVhr+OuF4vE/HjQgr1zMf2evGf5n1TSY1Sbgw=; b=rXznGgk5qeky+w+hlgCbxKN1JdQ8mQxI6L56rFY1o32J5H3aeowDG3vhDTduQES8I7v46CfEqrmA1I9hBb/6o9teyLvbtPMhcBxcPPBwLZVnEfh7YV44njZjopCtd7x1bAv23iA1M3uEFCocEO6c+U2sL2yexi9Pk8QdUyK9QBQ= Received: from DB6PR0501CA0033.eurprd05.prod.outlook.com (2603:10a6:4:67::19) by VI1PR08MB5327.eurprd08.prod.outlook.com (2603:10a6:803:13b::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.11; Tue, 19 Jan 2021 05:32:03 +0000 Received: from DB5EUR03FT043.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:67:cafe::39) by DB6PR0501CA0033.outlook.office365.com (2603:10a6:4:67::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10 via Frontend Transport; Tue, 19 Jan 2021 05:32:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dpdk.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dpdk.org; dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT043.mail.protection.outlook.com (10.152.20.236) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.12 via Frontend Transport; Tue, 19 Jan 2021 05:32:03 +0000 Received: ("Tessian outbound 28c96a6c9d2e:v71"); Tue, 19 Jan 2021 05:32:03 +0000 X-CR-MTA-TID: 64aa7808 Received: from 0f7a5def485a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id A9FB44D4-2E76-4199-9BE2-4B1C7B2E5E84.1; Tue, 19 Jan 2021 05:31:57 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 0f7a5def485a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 19 Jan 2021 05:31:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Bl0fsL4I973QSs2jFSoMq0J7hET+j+hLSxQkUwJtQLA/mNcsxwnqhcrw3kd0pTN0WnH2yT+60Zdm2MusqKuX8+7I8gJsuJmbOLMZJbtbSuFbpXRijwVALnXg6b5InawlvppwabAtryy2AY9wxEDXdY7vAYVvoc7tUuruvHCHxhuapNmv65vZmAhbvWomwmJ/ekN649fuug8qf1VpsrTKvR1mw/uL/Y5GCjAuEJLQuJnIrNx64+yLo404vkzl1A7n/CLom/8XtGatnUQ63OgCC7sAFrRMy8eMfUmZ3jtp7x6bE337M2APkFmQF0hFtSIM85BwI4WOiRS2bWGT3j6kxA== 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-SenderADCheck; bh=R/XPTxaVhr+OuF4vE/HjQgr1zMf2evGf5n1TSY1Sbgw=; b=g51CwwmKxxewfFzBJ9QjTi62lU8RDVO78PyAiey34qUrV/GfZ9RTGguEtRuTlZuDLHCuXnZpH4ndR4/3YZ3r0wV18kjhsZcEikWw4E32qdhBGTRWD15lM4TdAHy+SDuHrV26Sx1Q1s906FzjDc+IM8eCg0LV/Wf8BZmEBLCbOwRFoDayRxnX3/qAk/MTRJAPWWUaaG+N6QXCOQU4LG3jAitkn4tEc6mfC0WNlWxmnpCeK7UbkC1CemCTStlTVNi15Lv/quM9UY+/befcvI3wqNzhjEIabT+i3lKU6ibcPIklu94Fxssu6AWU43SGoAXGzgWwt9ZJAwPRcR9F7jFTQA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=R/XPTxaVhr+OuF4vE/HjQgr1zMf2evGf5n1TSY1Sbgw=; b=rXznGgk5qeky+w+hlgCbxKN1JdQ8mQxI6L56rFY1o32J5H3aeowDG3vhDTduQES8I7v46CfEqrmA1I9hBb/6o9teyLvbtPMhcBxcPPBwLZVnEfh7YV44njZjopCtd7x1bAv23iA1M3uEFCocEO6c+U2sL2yexi9Pk8QdUyK9QBQ= Received: from VI1PR0802MB2351.eurprd08.prod.outlook.com (2603:10a6:800:a0::10) by VI1PR08MB2703.eurprd08.prod.outlook.com (2603:10a6:802:25::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.9; Tue, 19 Jan 2021 05:31:53 +0000 Received: from VI1PR0802MB2351.eurprd08.prod.outlook.com ([fe80::b950:7a8:744:62bb]) by VI1PR0802MB2351.eurprd08.prod.outlook.com ([fe80::b950:7a8:744:62bb%10]) with mapi id 15.20.3763.014; Tue, 19 Jan 2021 05:31:53 +0000 From: Ruifeng Wang To: Bruce Richardson , "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , "stable@dpdk.org" , Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , Liron Himi , Fiona Trahe , John Griffin , Deepak Kumar Jain , Lee Daly , Ashish Gupta , Sunila Sahu , Somalapuram Amaranath , Michael Shamis , Declan Doherty , Ciara Loftus , Qi Zhang , Rasesh Mody , Shahed Shaikh , Zyta Szpak , Martin Spinler , David Hunt , Konstantin Ananyev , nd Thread-Topic: [PATCH] build: force pkg-config for dependency detection Thread-Index: AQHW7aaEEAnpj62RJUafzxyJRbV16KouasMA Date: Tue, 19 Jan 2021 05:31:52 +0000 Message-ID: References: <20210118142957.144067-1-bruce.richardson@intel.com> In-Reply-To: <20210118142957.144067-1-bruce.richardson@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: 8455429B836DF14B94595875E2B8AE13.0 x-checkrecipientchecked: true Authentication-Results-Original: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=arm.com; x-originating-ip: [203.126.0.111] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d74b813a-4982-455f-982f-08d8bc3b8d36 x-ms-traffictypediagnostic: VI1PR08MB2703:|VI1PR08MB5327: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:8882;OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: +ai4fZMcZRy4AtUEkpNoperCDoBvdawPKf8JSXXvi79Iv7GRkr4LCL11sQVzeM4A+o2Cg00GQ6ul0qtJY9boyl28oIhvv2MtNHPdMUZheReD19+kmS8m5ZaSUKgkdXjh8ojk5FArfeedPiCc/uAxwN39CPbPCEHgyf7+/TjLWqyeHGrAi6ykjvFn+viw3mgZ7iXoL+P57MjXQk0ZbL6c+SQJNUAX5bRxUaiFX2w29a9nR1tW8aFYcxFTtQ6BbQdnKB8sVYhyb8gqhMpSockUDBopFHcwthM6AYK8YvhTL/hbYmQRDf+7/JQ2qX2ZvsU6vt52o8pUO+KmW5us/zVkI1hlbFc4bdBq195C2uLGZ4Sp+QDd/xU/PnWH1xY0gsu3eLDFIro0w1EVrepnewynqw== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR0802MB2351.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(39860400002)(366004)(396003)(136003)(71200400001)(83380400001)(7696005)(33656002)(5660300002)(64756008)(86362001)(4326008)(66946007)(9686003)(66446008)(55016002)(66556008)(7416002)(66476007)(76116006)(26005)(478600001)(52536014)(54906003)(110136005)(186003)(316002)(2906002)(8676002)(53546011)(8936002)(6506007)(30864003); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?ThTyDpx8ZmtCBi9lYhL6RVvXPbicPuUjTJLF5LbAtOfZM8rj2+3yQgKQOWY/?= =?us-ascii?Q?SG59qybuL1UAJ3NRQUlVNT6vlVyU3z9lxYZsABGKSJTT/Bhe/d+FFNk8XxtX?= =?us-ascii?Q?2WoyL+h8q+wKxjPu2qkVwq4MmpognW7qKSZWmc4zplTL6aU3id5ItIqYFYjB?= =?us-ascii?Q?9mXyffHRydH4wVgFhhxLtElLS/WZPOdMsqe+bcgVQKb//f7sA7h2BO6yuS5M?= =?us-ascii?Q?0lI9EvjI7qpEYizrVIPy5P/Z4OZr44PirgXrKhkrnz1Scv3r2xSbs8Q42OAZ?= =?us-ascii?Q?4z+34SPlqZRLW/w8oln1PLu2hjuzqXevSAH4sZw1eLKI/JXziQmrTcSqEm1X?= =?us-ascii?Q?b75gPoaW0BHyelngriBE5gL3t0+tMXWB56ZNdEHhrqQU1AejLE7LSarwu+J4?= =?us-ascii?Q?rKMS4qgnhc/6E27glKwykoCii2T0QVeiYrMSB42+Klsso4++ErSDhZWQlxut?= =?us-ascii?Q?h8FNXv1xH+hgsqyRFxOplg7SdkdzyF6NHFveWHRTKpFCh4bDtxFnUoLU2wns?= =?us-ascii?Q?qnjgFAZJC6I2/iV9fFX76P4m2INf/HCwnWVD/vEmEnRQBOlBa+jHZLNbc3Yr?= =?us-ascii?Q?z91w24vj3+CaIevj3pDTEto/eejaCft0BFZUZsJ7/3F0M4RX+bSOFoNsymoq?= =?us-ascii?Q?FRuMPBtrLmA2TmbhnWitxqNU3WjG1vqQcAZm6+JexVrv4Gdps9/N2noazL+V?= =?us-ascii?Q?SDDxTlcEp1S73R/FsJu92E4WvMGwNOP87DTucESnsewlGFSHWyDSHasqwgEI?= =?us-ascii?Q?tQi+5CtKh1BUPoVlTmLnyEZZKqrFqAbp5ci5ArQcYUo15wwc7e2TAcD/73o/?= =?us-ascii?Q?L0OZscytypHvnFqV1tCF7Y4qKdeBxjkW0P8JiDpoI/Qj4zdUz78dplLsyHGL?= =?us-ascii?Q?ByTfiS4/ahTbIknaZVe4r6PmTPEfySpJ5Yh5514eVRNPXDLb38DHUBAnU+SM?= =?us-ascii?Q?YVTfH9+f9VlNJXfuLpsi7PuwG4VwcjdOWdA78ITTrYM=3D?= x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB2703 Original-Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT043.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: b4e0ec54-d266-4e56-5730-08d8bc3b8742 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RzKN6tOEZG/cu8GyPuGAsjetU4lI8xJmhcmFJTox6AsvvF4uUR99mhh/sb7zyz8fxdzOGUhexUfKcxiZzzjUzOc6V1QKKnnk1HbYBcPSQM+RUQlklS9yVKz8LAslxV3RzKu7bRQYP4ygsIGTu4wKtp7mVFCtx8iufWTh1zyCUcK1iWKK8JNw8ZkgmAq9qzgZnn24Kaet2Gujaq11ah94o7h5UfpoVwbTK6DR45WEcL+wyjVSGbKYNWkNcKqMAj4nNTvdpPDLjayITw+XrtO9zEY+Ixoo3x8/Qgsx5rCWbkoVOuZFL43JAXfjHaKCGmdegr2Uu1KfBU+1ro8dVC3LQmxtq9Hzyt35vC7QvszhyE5F7A6YWBHPxSwkEcaDWEcBStblcZrG5dnaNhnwpwj+dahAkSEBvOSemBwzcm/iJZK/EgQdr1QTk+Rv81ss9HpROG8aOz7LIEGH7g/qa1unBA== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(4636009)(396003)(136003)(376002)(346002)(39860400002)(46966006)(30864003)(2906002)(83380400001)(47076005)(53546011)(8936002)(186003)(7696005)(110136005)(52536014)(478600001)(5660300002)(316002)(81166007)(54906003)(82740400003)(82310400003)(33656002)(356005)(70586007)(8676002)(55016002)(86362001)(70206006)(450100002)(9686003)(336012)(4326008)(6506007)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jan 2021 05:32:03.1082 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d74b813a-4982-455f-982f-08d8bc3b8d36 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: DB5EUR03FT043.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB5327 Subject: Re: [dpdk-stable] [PATCH] build: force pkg-config for dependency detection 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 Sender: "stable" > -----Original Message----- > From: Bruce Richardson > Sent: Monday, January 18, 2021 10:30 PM > To: dev@dpdk.org > Cc: ferruh.yigit@intel.com; Bruce Richardson = ; > stable@dpdk.org; Matan Azrad ; Shahaf Shuler > ; Viacheslav Ovsiienko ; > Liron Himi ; Fiona Trahe ; > John Griffin ; Deepak Kumar Jain > ; Lee Daly ; Ashish Gupta > ; Sunila Sahu ; Ruifeng > Wang ; Somalapuram Amaranath > ; Michael Shamis ; Declan > Doherty ; Ciara Loftus = ; > Qi Zhang ; Rasesh Mody ; > Shahed Shaikh ; Zyta Szpak ; > Martin Spinler ; David Hunt ; > Konstantin Ananyev > Subject: [PATCH] build: force pkg-config for dependency detection >=20 > Meson can use cmake as a fallback for detecting packages, and this can le= ad > to picking up 64-libs for 32-bit builds. To work around this, force the u= se of > pkg-config only for detecting libcrypto, zlib, jansson and other package > dependencies. >=20 > CC: stable@dpdk.org >=20 > Signed-off-by: Bruce Richardson > --- >=20 > NOTE, as I do not have all packages for DPDK on my system I have not > verified that pkg-config files are present for all dependencies, > specifically: > * libAArch64crypto Checked the change works OK with libAArch64crypto package. Tested-by: Ruifeng Wang > * netcope-common (which in error message is reported as "libnfb"?) > * libsze2 > Maintainers, please double check these work ok. >=20 > --- > app/test/meson.build | 2 +- > config/meson.build | 2 +- > drivers/common/mlx5/linux/meson.build | 3 ++- > drivers/common/mvep/meson.build | 2 +- > drivers/common/qat/meson.build | 2 +- > drivers/compress/isal/meson.build | 2 +- > drivers/compress/zlib/meson.build | 2 +- > drivers/crypto/armv8/meson.build | 2 +- > drivers/crypto/ccp/meson.build | 2 +- > drivers/crypto/mvsam/meson.build | 2 +- > drivers/crypto/openssl/meson.build | 2 +- > drivers/crypto/qat/meson.build | 2 +- > drivers/net/af_xdp/meson.build | 5 +++-- > drivers/net/bnx2x/meson.build | 2 +- > drivers/net/mlx4/meson.build | 3 ++- > drivers/net/mvneta/meson.build | 2 +- > drivers/net/mvpp2/meson.build | 2 +- > drivers/net/nfb/meson.build | 2 +- > drivers/net/szedata2/meson.build | 2 +- > examples/vm_power_manager/meson.build | 2 +- > lib/librte_bpf/meson.build | 2 +- > lib/librte_metrics/meson.build | 2 +- > 22 files changed, 26 insertions(+), 23 deletions(-) >=20 > diff --git a/app/test/meson.build b/app/test/meson.build index > bb06a9243..d0d1d1998 100644 > --- a/app/test/meson.build > +++ b/app/test/meson.build > @@ -407,7 +407,7 @@ cflags +=3D ['-DALLOW_INTERNAL_API'] >=20 > test_dep_objs =3D [] > if dpdk_conf.has('RTE_LIB_COMPRESSDEV') > - compress_test_dep =3D dependency('zlib', required: false) > + compress_test_dep =3D dependency('zlib', required: false, method: > +'pkg-config') > if compress_test_dep.found() > test_dep_objs +=3D compress_test_dep > test_sources +=3D 'test_compressdev.c' > diff --git a/config/meson.build b/config/meson.build index > a3154e29c..d699a8622 100644 > --- a/config/meson.build > +++ b/config/meson.build > @@ -160,7 +160,7 @@ if fdt_dep.found() and cc.has_header('fdt.h') endif >=20 > # check for libbsd > -libbsd =3D dependency('libbsd', required: false) > +libbsd =3D dependency('libbsd', required: false, method: 'pkg-config') > if libbsd.found() > dpdk_conf.set('RTE_USE_LIBBSD', 1) > endif > diff --git a/drivers/common/mlx5/linux/meson.build > b/drivers/common/mlx5/linux/meson.build > index 580419e6d..220de3542 100644 > --- a/drivers/common/mlx5/linux/meson.build > +++ b/drivers/common/mlx5/linux/meson.build > @@ -19,7 +19,8 @@ endif > libnames =3D [ 'mlx5', 'ibverbs' ] > libs =3D [] > foreach libname:libnames > - lib =3D dependency('lib' + libname, static:static_ibverbs, required:fal= se) > + lib =3D dependency('lib' + libname, static:static_ibverbs, > + required:false, method: 'pkg-config') > if not lib.found() and not static_ibverbs > lib =3D cc.find_library(libname, required:false) > endif > diff --git a/drivers/common/mvep/meson.build > b/drivers/common/mvep/meson.build index 863a20ab9..7cd968b38 100644 > --- a/drivers/common/mvep/meson.build > +++ b/drivers/common/mvep/meson.build > @@ -4,7 +4,7 @@ > # All rights reserved. > # >=20 > -dep =3D dependency('libmusdk', required: false) > +dep =3D dependency('libmusdk', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libmusdk"' > diff --git a/drivers/common/qat/meson.build > b/drivers/common/qat/meson.build index 29e1299f2..b2915c91f 100644 > --- a/drivers/common/qat/meson.build > +++ b/drivers/common/qat/meson.build > @@ -23,7 +23,7 @@ if disabled_drivers.contains(qat_compress_path) > 'Explicitly disabled via build config') endif >=20 > -libcrypto =3D dependency('libcrypto', required: false) > +libcrypto =3D dependency('libcrypto', required: false, method: > +'pkg-config') > if qat_crypto and not libcrypto.found() > qat_crypto =3D false > dpdk_drvs_disabled +=3D qat_crypto_path > diff --git a/drivers/compress/isal/meson.build > b/drivers/compress/isal/meson.build > index 5ee17e28f..d847c2ea6 100644 > --- a/drivers/compress/isal/meson.build > +++ b/drivers/compress/isal/meson.build > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause # Copyright 2018 Intel Corporat= ion >=20 > -dep =3D dependency('libisal', required: false) > +dep =3D dependency('libisal', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libisal"' > diff --git a/drivers/compress/zlib/meson.build > b/drivers/compress/zlib/meson.build > index b19a6d2b1..82cf0dddd 100644 > --- a/drivers/compress/zlib/meson.build > +++ b/drivers/compress/zlib/meson.build > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Cavium > Networks >=20 > -dep =3D dependency('zlib', required: false) > +dep =3D dependency('zlib', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "zlib"' > diff --git a/drivers/crypto/armv8/meson.build > b/drivers/crypto/armv8/meson.build > index 3289a2adc..027173bc1 100644 > --- a/drivers/crypto/armv8/meson.build > +++ b/drivers/crypto/armv8/meson.build > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2019 Arm Limited >=20 > -dep =3D dependency('libAArch64crypto', required: false) > +dep =3D dependency('libAArch64crypto', required: false, method: > +'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libAArch64crypto"' > diff --git a/drivers/crypto/ccp/meson.build > b/drivers/crypto/ccp/meson.build index a0e0b379e..ff66427ae 100644 > --- a/drivers/crypto/ccp/meson.build > +++ b/drivers/crypto/ccp/meson.build > @@ -5,7 +5,7 @@ if not is_linux > build =3D false > reason =3D 'only supported on Linux' > endif > -dep =3D dependency('libcrypto', required: false) > +dep =3D dependency('libcrypto', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libcrypto"' > diff --git a/drivers/crypto/mvsam/meson.build > b/drivers/crypto/mvsam/meson.build > index 384eacff0..b4c55b5ff 100644 > --- a/drivers/crypto/mvsam/meson.build > +++ b/drivers/crypto/mvsam/meson.build > @@ -3,7 +3,7 @@ > # Copyright(c) 2018 Semihalf. > # All rights reserved. >=20 > -dep =3D dependency('libmusdk', required: false) > +dep =3D dependency('libmusdk', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libmusdk"' > diff --git a/drivers/crypto/openssl/meson.build > b/drivers/crypto/openssl/meson.build > index d9ac69897..47fb2bb75 100644 > --- a/drivers/crypto/openssl/meson.build > +++ b/drivers/crypto/openssl/meson.build > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel > Corporation >=20 > -dep =3D dependency('libcrypto', required: false) > +dep =3D dependency('libcrypto', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libcrypto"' > diff --git a/drivers/crypto/qat/meson.build > b/drivers/crypto/qat/meson.build index bc90ec44c..92e0ed656 100644 > --- a/drivers/crypto/qat/meson.build > +++ b/drivers/crypto/qat/meson.build > @@ -5,7 +5,7 @@ > # driver which comes later. Here we just add our sources files to the li= st > build =3D false reason =3D '' # sentinal value to suppress printout -dep= =3D > dependency('libcrypto', required: false) > +dep =3D dependency('libcrypto', required: false, method: 'pkg-config') > qat_includes +=3D include_directories('.') qat_deps +=3D 'cryptodev' > qat_deps +=3D 'net' > diff --git a/drivers/net/af_xdp/meson.build > b/drivers/net/af_xdp/meson.build index dce123036..60ccffabb 100644 > --- a/drivers/net/af_xdp/meson.build > +++ b/drivers/net/af_xdp/meson.build > @@ -9,14 +9,15 @@ endif >=20 > sources =3D files('rte_eth_af_xdp.c') >=20 > -bpf_dep =3D dependency('libbpf', required: false) > +bpf_dep =3D dependency('libbpf', required: false, method: 'pkg-config') > if not bpf_dep.found() > bpf_dep =3D cc.find_library('bpf', required: false) endif >=20 > if bpf_dep.found() and cc.has_header('bpf/xsk.h') and > cc.has_header('linux/if_xdp.h') > ext_deps +=3D bpf_dep > - bpf_ver_dep =3D dependency('libbpf', version : '>=3D0.2.0', required: > false) > + bpf_ver_dep =3D dependency('libbpf', version : '>=3D0.2.0', > + required: false, method: 'pkg-config') > if bpf_ver_dep.found() > dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', > 1) > endif > diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.buil= d > index 8837ef424..e260b7592 100644 > --- a/drivers/net/bnx2x/meson.build > +++ b/drivers/net/bnx2x/meson.build > @@ -7,7 +7,7 @@ if is_windows > subdir_done() > endif >=20 > -dep =3D dependency('zlib', required: false) > +dep =3D dependency('zlib', required: false, method: 'pkg-config') > build =3D dep.found() > reason =3D 'missing dependency, "zlib"' > ext_deps +=3D dep > diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build > index 0cf9938a8..d7602b748 100644 > --- a/drivers/net/mlx4/meson.build > +++ b/drivers/net/mlx4/meson.build > @@ -24,7 +24,8 @@ endif > libnames =3D [ 'mlx4', 'ibverbs' ] > libs =3D [] > foreach libname:libnames > - lib =3D dependency('lib' + libname, static:static_ibverbs, required:fal= se) > + lib =3D dependency('lib' + libname, static:static_ibverbs, > + required:false, method: 'pkg-config') > if not lib.found() and not static_ibverbs > lib =3D cc.find_library(libname, required:false) > endif > diff --git a/drivers/net/mvneta/meson.build > b/drivers/net/mvneta/meson.build index 4e073e0d2..0be7b3d8b 100644 > --- a/drivers/net/mvneta/meson.build > +++ b/drivers/net/mvneta/meson.build > @@ -9,7 +9,7 @@ if is_windows > subdir_done() > endif >=20 > -dep =3D dependency('libmusdk', required: false) > +dep =3D dependency('libmusdk', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libmusdk"' > diff --git a/drivers/net/mvpp2/meson.build > b/drivers/net/mvpp2/meson.build index c509d8916..bfda5439b 100644 > --- a/drivers/net/mvpp2/meson.build > +++ b/drivers/net/mvpp2/meson.build > @@ -9,7 +9,7 @@ if is_windows > subdir_done() > endif >=20 > -dep =3D dependency('libmusdk', required: false) > +dep =3D dependency('libmusdk', required: false, method: 'pkg-config') > if not dep.found() > build =3D false > reason =3D 'missing dependency, "libmusdk"' > diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build > index 42f7921dc..f4a89b87d 100644 > --- a/drivers/net/nfb/meson.build > +++ b/drivers/net/nfb/meson.build > @@ -9,7 +9,7 @@ if is_windows > subdir_done() > endif >=20 > -dep =3D dependency('netcope-common', required: false) > +dep =3D dependency('netcope-common', required: false, method: > +'pkg-config') > reason =3D 'missing dependency, "libnfb"' > build =3D dep.found() > ext_deps +=3D dep > diff --git a/drivers/net/szedata2/meson.build > b/drivers/net/szedata2/meson.build > index 4c02830b0..4f8f3325f 100644 > --- a/drivers/net/szedata2/meson.build > +++ b/drivers/net/szedata2/meson.build > @@ -7,7 +7,7 @@ if is_windows > subdir_done() > endif >=20 > -dep =3D dependency('libsze2', required: false) > +dep =3D dependency('libsze2', required: false, method: 'pkg-config') > build =3D dep.found() > reason =3D 'missing dependency, "libsze2"' > ext_deps +=3D dep > diff --git a/examples/vm_power_manager/meson.build > b/examples/vm_power_manager/meson.build > index 1f813fbe8..637bd2323 100644 > --- a/examples/vm_power_manager/meson.build > +++ b/examples/vm_power_manager/meson.build > @@ -41,7 +41,7 @@ opt_dep =3D cc.find_library('virt', required : false) = build =3D > opt_dep.found() ext_deps +=3D opt_dep >=20 > -opt_dep =3D dependency('jansson', required : false) > +opt_dep =3D dependency('jansson', required : false, method: 'pkg-config'= ) > if opt_dep.found() > ext_deps +=3D opt_dep > cflags +=3D '-DUSE_JANSSON' > diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build inde= x > 48460e950..614277eff 100644 > --- a/lib/librte_bpf/meson.build > +++ b/lib/librte_bpf/meson.build > @@ -19,7 +19,7 @@ headers =3D files('bpf_def.h', >=20 > deps +=3D ['mbuf', 'net', 'ethdev'] >=20 > -dep =3D dependency('libelf', required: false) > +dep =3D dependency('libelf', required: false, method: 'pkg-config') > if dep.found() > dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1) > sources +=3D files('bpf_load_elf.c') > diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.bu= ild > index eed27b880..28a8cc115 100644 > --- a/lib/librte_metrics/meson.build > +++ b/lib/librte_metrics/meson.build > @@ -4,7 +4,7 @@ > sources =3D files('rte_metrics.c') > headers =3D files('rte_metrics.h') >=20 > -jansson =3D dependency('jansson', required: false) > +jansson =3D dependency('jansson', required: false, method: 'pkg-config') > if jansson.found() > ext_deps +=3D jansson > sources +=3D files('rte_metrics_telemetry.c') > -- > 2.27.0