The library libnfb is part of netcope-common which provides a pkg-config file: netcope-common.pc. Looking for this .pc file - with dependency() - is preferred than looking for the library - with cc.find_library(). If the library is not installed in a standard path, it can be found thanks to PKG_CONFIG_PATH variable. The previous solution required to use CFLAGS and LDFLAGS environment variables. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- drivers/net/nfb/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build index 4502c3f76..d53e8eca7 100644 --- a/drivers/net/nfb/meson.build +++ b/drivers/net/nfb/meson.build @@ -3,14 +3,9 @@ # Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com> # All rights reserved. -dep = cc.find_library('nfb', required: false) +dep = dependency('netcope-common', required: false) reason = 'missing dependency, "libnfb"' - -build = dep.found() and cc.has_header('nfb/nfb.h', dependencies: dep) - -nc = dependency('netcope-common', required: false) - +build = dep.found() ext_deps += dep -ext_deps += nc sources = files('nfb_rx.c', 'nfb_tx.c', 'nfb_stats.c', 'nfb_ethdev.c', 'nfb_rxmode.c') -- 2.23.0
The library libsze2 provides a pkg-config file: libsze2.pc. Looking for this .pc file - with dependency() - is preferred than looking for the library - with cc.find_library(). If the library is not installed in a standard path, it can be found thanks to PKG_CONFIG_PATH variable. The previous solution required to use CFLAGS and LDFLAGS environment variables. Fixes: 508cfe6be9f1 ("net/szedata2: add to meson build") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- drivers/net/szedata2/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build index 032b42518..b53fcbc59 100644 --- a/drivers/net/szedata2/meson.build +++ b/drivers/net/szedata2/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -dep = cc.find_library('sze2', required: false) +dep = dependency('libsze2', required: false) build = dep.found() reason = 'missing dependency, "libsze2"' ext_deps += dep -- 2.23.0
On Sat, Sep 14, 2019 at 11:37 AM Thomas Monjalon <thomas@monjalon.net> wrote: > > The library libnfb is part of netcope-common which provides > a pkg-config file: netcope-common.pc. > Looking for this .pc file - with dependency() - is preferred > than looking for the library - with cc.find_library(). > > If the library is not installed in a standard path, > it can be found thanks to PKG_CONFIG_PATH variable. > The previous solution required to use CFLAGS and LDFLAGS > environment variables. > > Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") > Cc: stable@dpdk.org > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Acked-by: Jan Remes <remes@netcope.com> > --- > drivers/net/nfb/meson.build | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build > index 4502c3f76..d53e8eca7 100644 > --- a/drivers/net/nfb/meson.build > +++ b/drivers/net/nfb/meson.build > @@ -3,14 +3,9 @@ > # Copyright(c) 2019 Netcope Technologies, a.s. <info@netcope.com> > # All rights reserved. > > -dep = cc.find_library('nfb', required: false) > +dep = dependency('netcope-common', required: false) > reason = 'missing dependency, "libnfb"' > - > -build = dep.found() and cc.has_header('nfb/nfb.h', dependencies: dep) > - > -nc = dependency('netcope-common', required: false) > - > +build = dep.found() > ext_deps += dep > -ext_deps += nc > > sources = files('nfb_rx.c', 'nfb_tx.c', 'nfb_stats.c', 'nfb_ethdev.c', 'nfb_rxmode.c') > -- > 2.23.0 >
On Sat, Sep 14, 2019 at 11:37 AM Thomas Monjalon <thomas@monjalon.net> wrote: > > The library libsze2 provides a pkg-config file: libsze2.pc. > Looking for this .pc file - with dependency() - is preferred > than looking for the library - with cc.find_library(). > > If the library is not installed in a standard path, > it can be found thanks to PKG_CONFIG_PATH variable. > The previous solution required to use CFLAGS and LDFLAGS > environment variables. > > Fixes: 508cfe6be9f1 ("net/szedata2: add to meson build") > Cc: stable@dpdk.org > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net> Acked-by: Jan Remes <remes@netcope.com> > --- > drivers/net/szedata2/meson.build | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build > index 032b42518..b53fcbc59 100644 > --- a/drivers/net/szedata2/meson.build > +++ b/drivers/net/szedata2/meson.build > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: BSD-3-Clause > # Copyright(c) 2018 Intel Corporation > > -dep = cc.find_library('sze2', required: false) > +dep = dependency('libsze2', required: false) > build = dep.found() > reason = 'missing dependency, "libsze2"' > ext_deps += dep > -- > 2.23.0 >
15/09/2019 14:04, Jan Remeš:
> On Sat, Sep 14, 2019 at 11:37 AM Thomas Monjalon <thomas@monjalon.net> wrote:
> >
> > The library libnfb is part of netcope-common which provides
> > a pkg-config file: netcope-common.pc.
> > Looking for this .pc file - with dependency() - is preferred
> > than looking for the library - with cc.find_library().
> >
> > If the library is not installed in a standard path,
> > it can be found thanks to PKG_CONFIG_PATH variable.
> > The previous solution required to use CFLAGS and LDFLAGS
> > environment variables.
> >
> > Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> Acked-by: Jan Remes <remes@netcope.com>
Series applied
16/09/2019 17:46, Thomas Monjalon:
> 15/09/2019 14:04, Jan Remeš:
> > On Sat, Sep 14, 2019 at 11:37 AM Thomas Monjalon <thomas@monjalon.net> wrote:
> > >
> > > The library libnfb is part of netcope-common which provides
> > > a pkg-config file: netcope-common.pc.
> > > Looking for this .pc file - with dependency() - is preferred
> > > than looking for the library - with cc.find_library().
> > >
> > > If the library is not installed in a standard path,
> > > it can be found thanks to PKG_CONFIG_PATH variable.
> > > The previous solution required to use CFLAGS and LDFLAGS
> > > environment variables.
> > >
> > > Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver")
> > > Cc: stable@dpdk.org
> > >
> > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> > Acked-by: Jan Remes <remes@netcope.com>
>
> Series applied
Sorry no, not applied on master.
It should go in next-net after Ferruh's review.