From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id C18A3A0096
for <public@inbox.dpdk.org>; Sat, 13 Apr 2019 01:25:12 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 9FEA61B41B;
Sat, 13 Apr 2019 01:25:12 +0200 (CEST)
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id 5F17A1B3B6
for <stable@dpdk.org>; Sat, 13 Apr 2019 01:25:07 +0200 (CEST)
Received: from Internal Mail-Server by MTLPINE1 (envelope-from
yskoh@mellanox.com)
with ESMTPS (AES256-SHA encrypted); 13 Apr 2019 02:25:05 +0300
Received: from mtibiz05-l.mti.labs.mlnx. (mtibiz05-l.mti.labs.mlnx
[10.20.10.109])
by labmailer.mlnx (8.13.8/8.13.8) with ESMTP id x3CNOrWI006596;
Sat, 13 Apr 2019 02:25:02 +0300
From: Yongseok Koh <yskoh@mellanox.com>
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: Fri, 12 Apr 2019 16:24:48 -0700
Message-Id: <20190412232451.30197-4-yskoh@mellanox.com>
X-Mailer: git-send-email 2.21.0.196.g041f5ea
In-Reply-To: <20190412232451.30197-1-yskoh@mellanox.com>
References: <20190412232451.30197-1-yskoh@mellanox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] [PATCH 3/6] 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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
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 <yskoh@mellanox.com>
---
drivers/net/mlx4/meson.build | 19 +++++++++++--------
drivers/net/mlx5/meson.build | 19 +++++++++++--------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index de020701d1..9082f69f25 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -13,21 +13,24 @@ 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),
-]
+libs = [ 'libmnl', 'libmlx4', 'libibverbs' ]
+lib_deps = []
build = true
foreach lib:libs
- if not lib.found()
+ lib_dep = dependency(lib, required:false)
+ if not lib_dep.found()
+ lib_dep = cc.find_library(lib, required:false)
+ endif
+ if lib_dep.found()
+ lib_deps += [ lib_dep ]
+ else
build = false
endif
endforeach
# Compile PMD
if build
allow_experimental_apis = true
- ext_deps += libs
+ ext_deps += lib_deps
sources = files(
'mlx4.c',
'mlx4_ethdev.c',
@@ -103,7 +106,7 @@ if pmd_dlopen and build
dlopen_sources,
include_directories: global_inc,
c_args: cflags,
- dependencies: libs,
+ dependencies: libs_deps,
link_args: [
'-Wl,-export-dynamic',
'-Wl,-h,@0@'.format(LIB_GLUE),
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index a4c684e1b5..42701c51de 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -13,20 +13,23 @@ 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),
-]
+libs = [ 'libmnl', 'libmlx5', 'libibverbs' ]
+lib_deps = []
build = true
foreach lib:libs
- if not lib.found()
+ lib_dep = dependency(lib, required:false)
+ if not lib_dep.found()
+ lib_dep = cc.find_library(lib, required:false)
+ endif
+ if lib_dep.found()
+ lib_deps += [ lib_dep ]
+ else
build = false
endif
endforeach
if build
allow_experimental_apis = true
- ext_deps += libs
+ ext_deps += lib_deps
sources = files(
'mlx5.c',
'mlx5_ethdev.c',
@@ -299,7 +302,7 @@ if pmd_dlopen and build
dlopen_sources,
include_directories: global_inc,
c_args: cflags,
- dependencies: libs,
+ dependencies: lib_deps,
link_args: [
'-Wl,-export-dynamic',
'-Wl,-h,@0@'.format(LIB_GLUE),
--
2.21.0.196.g041f5ea