From: Luca Boccassi <bluca@debian.org>
To: Yongseok Koh <yskoh@mellanox.com>,
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, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH 3/6] net/mlx: fix library search in meson build
Date: Mon, 15 Apr 2019 11:12:29 +0100 [thread overview]
Message-ID: <27a65b1d1737f475a6e32d5c3947d1c2b81d37fb.camel@debian.org> (raw)
In-Reply-To: <20190412232451.30197-4-yskoh@mellanox.com>
On Fri, 2019-04-12 at 16:24 -0700, Yongseok Koh wrote:
> 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)
Doesn't this end up trying to link the test program to -llibmnl and
thus failing?
> + 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),
--
Kind regards,
Luca Boccassi
next prev parent reply other threads:[~2019-04-15 10:12 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190412232451.30197-1-yskoh@mellanox.com>
2019-04-12 23:24 ` [dpdk-stable] [PATCH 1/6] meson: disable octeontx for buggy compilers on arm64 Yongseok Koh
2019-04-13 5:52 ` [dpdk-stable] [EXT] " Pavan Nikhilesh Bhagavatula
2019-04-15 18:16 ` Yongseok Koh
2019-04-12 23:24 ` [dpdk-stable] [PATCH 3/6] net/mlx: fix library search in meson build Yongseok Koh
2019-04-15 9:19 ` Bruce Richardson
2019-04-15 19:48 ` Yongseok Koh
2019-04-15 10:12 ` Luca Boccassi [this message]
2019-04-15 19:48 ` Yongseok Koh
2019-04-18 9:25 ` Luca Boccassi
2019-04-18 10:14 ` Bruce Richardson
2019-04-18 11:25 ` Yongseok Koh
2019-04-18 1:47 ` [dpdk-stable] [PATCH v2 1/4] meson: disable octeontx for buggy compilers on arm64 Yongseok Koh
2019-04-18 1:47 ` [dpdk-stable] [PATCH v2 3/4] net/mlx: fix library search in meson build Yongseok Koh
2019-04-18 7:21 ` [dpdk-stable] [EXT] [PATCH v2 1/4] meson: disable octeontx for buggy compilers on arm64 Jerin Jacob Kollanukkaran
2019-04-18 10:41 ` Yongseok Koh
2019-04-18 11:04 ` Thomas Monjalon
2019-04-18 11:10 ` Yongseok Koh
2019-04-18 11:49 ` [dpdk-stable] [PATCH v3 1/4] drivers/event: " Yongseok Koh
2019-04-18 11:49 ` [dpdk-stable] [PATCH v3 3/4] net/mlx: fix library search in meson build Yongseok Koh
2019-04-18 12:02 ` Luca Boccassi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=27a65b1d1737f475a6e32d5c3947d1c2b81d37fb.camel@debian.org \
--to=bluca@debian.org \
--cc=Honnappa.Nagarahalli@arm.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=gavin.hu@arm.com \
--cc=jerinj@marvell.com \
--cc=pbhagavatula@marvell.com \
--cc=shahafs@mellanox.com \
--cc=stable@dpdk.org \
--cc=thomas@monjalon.net \
--cc=yskoh@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).