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 755B3A0A04 for ; Tue, 19 Jan 2021 10:19:23 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5CFCF140D63; Tue, 19 Jan 2021 10:19:23 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id E8FE2140D4D; Tue, 19 Jan 2021 10:19:19 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 10J9AMLr004213; Tue, 19 Jan 2021 01:19:06 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : references : in-reply-to : content-type : content-transfer-encoding : mime-version; s=pfpt0220; bh=nY8i0o+6vcf9nwzooDrk0Wjf3SmfhEFSxLN57diOewI=; b=e0ZafeoVCxGFPru8n7kX3VoB9YXwkZs+I1bvJ7/Fl7pC0xzAtwba7eUgYmvnxSHdedGo vXs4q/PPqyf1sZe9fGjutiUuFLk8LhAENyjY/1vweKA6sgD3Ro03tgYB80DKhqohWznE SgBaRlqKwHomYpTjx62D3uU7b0kNwaRktZbHLSrnZ3kBlW/mUHtGMMfpayhV/FxNTsQj rit7Y/5JubirYUwPpRqn22fPdyx/EGtEoejXHIwwXjuftDurIJJTB1rJfSjYMD9rXB+q MXRftjH0qU7MN2lwDW9B3irBMlIbXJmQ/Cvu/hpNkbzUsSVCP9MM2F1nyLR2iLlPEzVX HA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3640hswwns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 19 Jan 2021 01:19:06 -0800 Received: from SC-EXCH02.marvell.com (10.93.176.82) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 19 Jan 2021 01:19:04 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 19 Jan 2021 01:19:04 -0800 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.100) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 19 Jan 2021 01:19:03 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8NTfG3k7VGldWGe///XcGRkq5PlqpeAXS7gysPkLG5+isky7lG7rs+RY6euScvxLWvb0dMzfrvxzA+rTezuqG7sOPgIuQdkq5kkHkrJbeElfPG9Fc/zzNUT4yUTZIretl5oHbm0q3pg8mPUOEdmPQqWrTppaty8d7uH6hS/QprAchA1vwTqDENqq+SyhGU2d0tGXeLfJn/vx1dh+Tax8hYe3WSU9avfLDkeswCCQ/YuNz7dbK/WuoI7EP1U+ltcqZv7BFSSH6Sz5zvxVW0/SSiWZ+m6VHhg7wfoHuollZ5zhL1/+QNdCqUdnhy6Bg6OP+gd+IMlhn5Jw5/QllPbdg== 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=nY8i0o+6vcf9nwzooDrk0Wjf3SmfhEFSxLN57diOewI=; b=Hv4An+TY1bIEjClRfYlxPBV8VuhVoN491uwKA8LErevoaMHWVpkOVnCZlqdLXtJh4xlLVc14aqltS3FhfJ4QGd9PSyoypk1l9CEaUOaSWMRHCn82SUT+YgJ7aZ/Rb3Vwpd3R5AUv7ZklOj7kz/S4DeHZ0NNjFzP4FhgrYzGsJPu8YQQrcLPPLVvsIzXUd0MQi0TnR5F+rNqAOcvM8Ea9j4Uu9at3/nodUC+XelswbCSt/ILBtXjrB7g5mniIpszhPR9sJSnhnF6ci2omOMX+ShhNWggHhu+XRf1fXe2DR8+9lBhhy8FYLK6CWfU5gEhrzlTVMaG8ISnkRmJQ+Zsk3Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nY8i0o+6vcf9nwzooDrk0Wjf3SmfhEFSxLN57diOewI=; b=lch4Ozk++NuLjeEpDEKexyDffRES2kys24LwFJJgTf1kofrGxSQLo14po8y+IWHxRur7se0lZ6OL2S0yqsY+C/vMZmUBFqDQ4e4n+fC2lMAE8aOp4r4PtffyDeQUMTcFDrExM82n8SDbMZKpHkWh7RjvO2XwIGoRrolCw4fSW/E= Received: from DM5PR18MB2214.namprd18.prod.outlook.com (2603:10b6:4:b9::21) by DM5PR18MB1484.namprd18.prod.outlook.com (2603:10b6:3:bb::7) 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 09:19:01 +0000 Received: from DM5PR18MB2214.namprd18.prod.outlook.com ([fe80::a517:8b23:b83e:a12f]) by DM5PR18MB2214.namprd18.prod.outlook.com ([fe80::a517:8b23:b83e:a12f%3]) with mapi id 15.20.3784.011; Tue, 19 Jan 2021 09:19:01 +0000 From: Liron Himi To: Bruce Richardson , "dev@dpdk.org" CC: "ferruh.yigit@intel.com" , "stable@dpdk.org" , Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko , "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 , Liron Himi Thread-Topic: [EXT] [PATCH] build: force pkg-config for dependency detection Thread-Index: AQHW7aaToonJLRcsj0u3VXJ5A/UWDqourG0w Date: Tue, 19 Jan 2021 09:19:01 +0000 Message-ID: References: <20210118142957.144067-1-bruce.richardson@intel.com> In-Reply-To: <20210118142957.144067-1-bruce.richardson@intel.com> Accept-Language: he-IL, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=marvell.com; x-originating-ip: [46.117.186.16] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4b918af0-d28e-4da3-4572-08d8bc5b426b x-ms-traffictypediagnostic: DM5PR18MB1484: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZuXwLRr3ZKtHojdqg4QYLBQ3QxQKAfbp6hTeSx0qYQZxjBOKHLrHid8nbJzcocdMlqJ1UjMEYas22Xw/J3BOTouLPIo4EtVVxMCeTIriLNGeeuWZk9yYbl6g/81WPRcBXEsjefUbY3c3DlXCyWc8bPoNAyqccqazFdYdjnlcSWZKZmcUHaZd33zFc/ZGpvNdRqV6ZQGiubZwMhDf9NYzrPbysgxUvgUr53UT7hKVQPXjG9B9QE1WWZ774M/6n0ojYsrJMYJnlUG+v9ThvcFX9Tdpc8nP5cxHtEB8C8qkrreotn37eM1sqzFOIays0GY6JCykvLzUgvKdl9mb4VIOfXPXCuujOgYUISWEiIrbE6n65pMukuW3GyfeV18+zyaK23Wa+s5W5wPRE7i4FmB6SQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR18MB2214.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(376002)(136003)(39850400004)(366004)(396003)(316002)(110136005)(76116006)(66476007)(66556008)(64756008)(66446008)(66946007)(8936002)(54906003)(52536014)(4326008)(9686003)(55016002)(7416002)(186003)(26005)(8676002)(107886003)(6506007)(53546011)(83380400001)(5660300002)(478600001)(7696005)(86362001)(33656002)(2906002)(30864003)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?kH7JneTBxsHS7UFUq2zA2/aj8vLhEVnQ1lRFjdTwjAmjkYib5/AtEAP+mcNK?= =?us-ascii?Q?M7/jbVaccJTWNQ/De6JnR8h35syIG4k6GsMrwdkuyYjD4JLneKXZz+pRBkkx?= =?us-ascii?Q?GMBVgW5qaWZ1e9vojH4EVZtXESNP54aajNdLFjvtpEI5h24SZAGqvFIjsMnx?= =?us-ascii?Q?s/CvZ3EBdxUO6WsbMigfksdGQqLYkJYT9JGgV1gQFIuQHjefaOAoyI2oIMDi?= =?us-ascii?Q?nahpfaEGJJAv/ZI0FfQoR807eLcsVwAZXJeFeiF9+SWdOaVY/3G6P+cpSWOc?= =?us-ascii?Q?wcTxF//ZsKqBo7YjNy+F5F760k6IHWyL2s5gnWM0qhzbr+pIX1IKrISEYVBU?= =?us-ascii?Q?SR5gzUPKQY9HB/LxLKgn61jPdo+iNYqzSsIKfNk1r9QUjgmw0SYDY8hhI8L8?= =?us-ascii?Q?z4AD+Lrif3u7typZoClw4ipfjBrcuGy6EKTW53TW3PNOnhX+lJeMBAWH814U?= =?us-ascii?Q?YmWmFun+pOJUr5ubm3epDWT2RuYHZ2VYjmI5J3zx3nI03mKdPvVjP5HkrbV6?= =?us-ascii?Q?MzUXSF5Ij0TtuaO3qlvtovX2lfYm62F7Dq9PB6fDnAHlGQz0cKvuhlf3vTUg?= =?us-ascii?Q?5zHAe/lJDF053E59T6bOsXyDlhpTam42AlAMIopDNp9CvWurdb0SPSQgnHME?= =?us-ascii?Q?GBNIwRRllAEXGIbwmIl5c/mcK91CgLXTVSo3Xh3ynFSXbm+IZgDoimXxpbRr?= =?us-ascii?Q?P1zZuKQ5YobIYNW22IxlycomZfACis3HFU0iwMfPzTwE81JU9jTimfk1s3y2?= =?us-ascii?Q?c8xfSBATJC4eZZMb6rnxi/E5PXCj6dVtS6BwLJdTFybLOsDgN6u+SOsoav+S?= =?us-ascii?Q?oU6eliviAdIN/L5L3Sk3uTVS7dFdQvxAQ/0rpx3Gvtyugi+7sh8viQKdYm82?= =?us-ascii?Q?ia5QpEJJp9WqqmJ1VZnyYvCzipp0ET2mvQUzSvZHW4u2I1xW0aDCgFebZITu?= =?us-ascii?Q?khUqzbomZgDRyNbTrVWdrGQyx+GcGRlM425hTbgPbmo=3D?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR18MB2214.namprd18.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b918af0-d28e-4da3-4572-08d8bc5b426b X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2021 09:19:01.3848 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 70e1fb47-1155-421d-87fc-2e58f638b6e0 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: gvNsT/DWDJO8bQxCpAtrf00xuDbCbX+5PHTxsD+ze8227vWqvUwbo2GtpqREpfbiKlz2lUf9y0gZ6pGmpKbRww== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR18MB1484 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2021-01-19_02:2021-01-18, 2021-01-19 signatures=0 Subject: Re: [dpdk-stable] [EXT] [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" libmusdk works with this change. Tested-by: Liron Himi -----Original Message----- From: Bruce Richardson =20 Sent: Monday, 18 January 2021 16:30 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: [EXT] [PATCH] build: force pkg-config for dependency detection External Email ---------------------------------------------------------------------- Meson can use cmake as a fallback for detecting packages, and this can lead= to picking up 64-libs for 32-bit builds. To work around this, force the us= e of pkg-config only for detecting libcrypto, zlib, jansson and other packa= ge dependencies. CC: stable@dpdk.org Signed-off-by: Bruce Richardson --- NOTE, as I do not have all packages for DPDK on my system I have not verifi= ed that pkg-config files are present for all dependencies, specifically: * libAArch64crypto * netcope-common (which in error message is reported as "libnfb"?) * libsze2 Maintainers, please double check these work ok. --- 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(-) diff --git a/app/test/meson.build b/app/test/meson.build index bb06a9243..d= 0d1d1998 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -407,7 +407,7 @@ cflags +=3D ['-DALLOW_INTERNAL_API'] 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:=20 +'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..d699a= 8622 100644 --- a/config/meson.build +++ b/config/meson.build @@ -160,7 +160,7 @@ if fdt_dep.found() and cc.has_header('fdt.h') endif # 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/li= nux/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:false= ) + 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.bu= ild index 863a20ab9..7cd968b38 100644 --- a/drivers/common/mvep/meson.build +++ b/drivers/common/mvep/meson.build @@ -4,7 +4,7 @@ # All rights reserved. # -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.buil= d 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 -libcrypto =3D dependency('libcrypto', required: false) +libcrypto =3D dependency('libcrypto', required: false, method:=20 +'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/meso= n.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 Corporatio= n -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/meso= n.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 Networ= ks -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 -dep =3D dependency('libAArch64crypto', required: false) +dep =3D dependency('libAArch64crypto', required: false, method:=20 +'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.buil= d 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. -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/me= son.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 Corpora= tion -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.buil= d 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 list= 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.buil= d index dce123036..60ccffabb 100644 --- a/drivers/net/af_xdp/meson.build +++ b/drivers/net/af_xdp/meson.build @@ -9,14 +9,15 @@ endif sources =3D files('rte_eth_af_xdp.c') -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 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: fal= se) + 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.build = 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 -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 in= dex 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:false= ) + 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.buil= d 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 -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 -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 inde= x 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 -dep =3D dependency('netcope-common', required: false) +dep =3D dependency('netcope-common', required: false, method:=20 +'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 -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_mana= ger/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) bu= ild =3D opt_dep.found() ext_deps +=3D opt_dep -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 index = 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', deps +=3D ['mbuf', 'net', 'ethdev'] -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.buil= d 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') -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