From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <yskoh@mellanox.com>
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id 7F9C61B9BC
for <dev@dpdk.org>; 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 <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: 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-dev] [PATCH v3 3/4] net/mlx: fix library search in meson build
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Apr 2019 11:49:20 -0000
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>
---
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
From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id EE926A00E6
for <public@inbox.dpdk.org>; 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 BF7491B9C1;
Thu, 18 Apr 2019 13:49:24 +0200 (CEST)
Received: from mellanox.co.il (mail-il-dmz.mellanox.com [193.47.165.129])
by dpdk.org (Postfix) with ESMTP id 7F9C61B9BC
for <dev@dpdk.org>; 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 <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: 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-dev] [PATCH v3 3/4] net/mlx: fix library search in meson build
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Content-Type: text/plain; charset="UTF-8"
Message-ID: <20190418114902.4I-wI5IWReoQrV_SRJFqOuITc0pJX_tc5b_nSEF1_OQ@z>
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>
---
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