patches for DPDK stable branches
 help / color / mirror / Atom feed
* [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check
       [not found] <20190914093700.11451-1-thomas@monjalon.net>
@ 2019-09-14  9:36 ` Thomas Monjalon
  2019-09-15 12:04   ` Jan Remeš
  2019-09-14  9:37 ` [dpdk-stable] [PATCH 2/2] net/szedata2: " Thomas Monjalon
  1 sibling, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2019-09-14  9:36 UTC (permalink / raw)
  To: bruce.richardson, Rastislav Cernay, Jan Remes; +Cc: dev, stable

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [dpdk-stable] [PATCH 2/2] net/szedata2: fix dependency check
       [not found] <20190914093700.11451-1-thomas@monjalon.net>
  2019-09-14  9:36 ` [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check Thomas Monjalon
@ 2019-09-14  9:37 ` Thomas Monjalon
  2019-09-15 12:05   ` Jan Remeš
  1 sibling, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2019-09-14  9:37 UTC (permalink / raw)
  To: bruce.richardson, Jan Remes, Rastislav Cernay; +Cc: dev, stable

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


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check
  2019-09-14  9:36 ` [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check Thomas Monjalon
@ 2019-09-15 12:04   ` Jan Remeš
  2019-09-16 15:46     ` Thomas Monjalon
  0 siblings, 1 reply; 6+ messages in thread
From: Jan Remeš @ 2019-09-15 12:04 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: bruce.richardson, Rastislav Cernay, dev, stable

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
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [PATCH 2/2] net/szedata2: fix dependency check
  2019-09-14  9:37 ` [dpdk-stable] [PATCH 2/2] net/szedata2: " Thomas Monjalon
@ 2019-09-15 12:05   ` Jan Remeš
  0 siblings, 0 replies; 6+ messages in thread
From: Jan Remeš @ 2019-09-15 12:05 UTC (permalink / raw)
  To: Thomas Monjalon; +Cc: bruce.richardson, Rastislav Cernay, dev, stable

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
>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check
  2019-09-15 12:04   ` Jan Remeš
@ 2019-09-16 15:46     ` Thomas Monjalon
  2019-09-16 15:51       ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Monjalon @ 2019-09-16 15:46 UTC (permalink / raw)
  To: Jan Remeš; +Cc: stable, bruce.richardson, Rastislav Cernay, dev

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




^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [dpdk-stable] [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check
  2019-09-16 15:46     ` Thomas Monjalon
@ 2019-09-16 15:51       ` Thomas Monjalon
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Monjalon @ 2019-09-16 15:51 UTC (permalink / raw)
  To: ferruh.yigit
  Cc: dev, Jan Remeš, stable, bruce.richardson, Rastislav Cernay

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.



^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-09-16 15:51 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20190914093700.11451-1-thomas@monjalon.net>
2019-09-14  9:36 ` [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check Thomas Monjalon
2019-09-15 12:04   ` Jan Remeš
2019-09-16 15:46     ` Thomas Monjalon
2019-09-16 15:51       ` [dpdk-stable] [dpdk-dev] " Thomas Monjalon
2019-09-14  9:37 ` [dpdk-stable] [PATCH 2/2] net/szedata2: " Thomas Monjalon
2019-09-15 12:05   ` Jan Remeš

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).