From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 78B51A00E6 for ; Thu, 18 Apr 2019 13:49:28 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0C71C1B9CB; Thu, 18 Apr 2019 13:49:28 +0200 (CEST) Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129]) by dpdk.org (Postfix) with ESMTP id 7C8E11B9BB for ; Thu, 18 Apr 2019 13:49:19 +0200 (CEST) Received: from Internal Mail-Server by MTLPINE1 (envelope-from yskoh@mellanox.com) with ESMTPS (AES256-SHA encrypted); 18 Apr 2019 14:49:16 +0300 Received: from scfae-sc-2.mti.labs.mlnx (scfae-sc-2.mti.labs.mlnx [10.101.0.96]) by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x3IBn6jE003469; Thu, 18 Apr 2019 14:49:13 +0300 From: Yongseok Koh To: bruce.richardson@intel.com, jerinj@marvell.com, pbhagavatula@marvell.com, shahafs@mellanox.com Cc: dev@dpdk.org, thomas@monjalon.net, gavin.hu@arm.com, Honnappa.Nagarahalli@arm.com, bluca@debian.org, stable@dpdk.org Date: Thu, 18 Apr 2019 04:49:02 -0700 Message-Id: <20190418114903.42231-3-yskoh@mellanox.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190418114903.42231-1-yskoh@mellanox.com> References: <20190412232451.30197-1-yskoh@mellanox.com> <20190418114903.42231-1-yskoh@mellanox.com> Subject: [dpdk-stable] [PATCH v3 3/4] net/mlx: fix library search in meson build X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" If MLNX_OFED is installed, there's no .pc file installed for libraries and dependency() can't find libraries by pkg-config. By adding fallback of using cc.find_library(), libraries are properly located. Fixes: e30b4e566f47 ("build: improve dependency handling") Cc: bluca@debian.org Cc: stable@dpdk.org Signed-off-by: Yongseok Koh --- v3: * use lib name without 'lib' prefix for cc.find_library() v2: * change variable names to minimize code change drivers/net/mlx4/meson.build | 15 +++++++++------ drivers/net/mlx5/meson.build | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index de020701d1..2540489bb7 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -13,14 +13,17 @@ if pmd_dlopen '-DMLX4_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION), ] endif -libs = [ - dependency('libmnl', required:false), - dependency('libmlx4', required:false), - dependency('libibverbs', required:false), -] +libnames = [ 'mnl', 'mlx4', 'ibverbs' ] +libs = [] build = true -foreach lib:libs +foreach libname:libnames + lib = dependency('lib' + libname, required:false) if not lib.found() + lib = cc.find_library(libname, required:false) + endif + if lib.found() + libs += [ lib ] + else build = false endif endforeach diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index a4c684e1b5..1a65c3a989 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -13,14 +13,17 @@ if pmd_dlopen '-DMLX5_GLUE_VERSION="@0@"'.format(LIB_GLUE_VERSION), ] endif -libs = [ - dependency('libmnl', required:false), - dependency('libmlx5', required:false), - dependency('libibverbs', required:false), -] +libnames = [ 'mnl', 'mlx5', 'ibverbs' ] +libs = [] build = true -foreach lib:libs +foreach libname:libnames + lib = dependency('lib' + libname, required:false) if not lib.found() + lib = cc.find_library(libname, required:false) + endif + if lib.found() + libs += [ lib ] + else build = false endif endforeach -- 2.11.0