* [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check
2019-09-14 9:36 [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Thomas Monjalon
@ 2019-09-14 9:36 ` Thomas Monjalon
2019-09-15 12:04 ` Jan Remeš
2019-09-14 9:37 ` [dpdk-dev] [PATCH 2/2] net/szedata2: " Thomas Monjalon
` (2 subsequent siblings)
3 siblings, 1 reply; 10+ 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] 10+ messages in thread
* Re: [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check
2019-09-14 9:36 ` [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check Thomas Monjalon
@ 2019-09-15 12:04 ` Jan Remeš
2019-09-16 15:46 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
0 siblings, 1 reply; 10+ 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] 10+ messages in thread
* Re: [dpdk-dev] [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 ` Thomas Monjalon
0 siblings, 1 reply; 10+ 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] 10+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH 1/2] net/nfb: fix dependency check
2019-09-16 15:46 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
@ 2019-09-16 15:51 ` Thomas Monjalon
0 siblings, 0 replies; 10+ 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] 10+ messages in thread
* [dpdk-dev] [PATCH 2/2] net/szedata2: fix dependency check
2019-09-14 9:36 [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Thomas Monjalon
2019-09-14 9:36 ` [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check Thomas Monjalon
@ 2019-09-14 9:37 ` Thomas Monjalon
2019-09-15 12:05 ` Jan Remeš
2019-09-16 15:34 ` [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Ferruh Yigit
2019-10-03 15:23 ` Ferruh Yigit
3 siblings, 1 reply; 10+ 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] 10+ messages in thread
* Re: [dpdk-dev] [PATCH 2/2] net/szedata2: fix dependency check
2019-09-14 9:37 ` [dpdk-dev] [PATCH 2/2] net/szedata2: " Thomas Monjalon
@ 2019-09-15 12:05 ` Jan Remeš
0 siblings, 0 replies; 10+ 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] 10+ messages in thread
* Re: [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies
2019-09-14 9:36 [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Thomas Monjalon
2019-09-14 9:36 ` [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check Thomas Monjalon
2019-09-14 9:37 ` [dpdk-dev] [PATCH 2/2] net/szedata2: " Thomas Monjalon
@ 2019-09-16 15:34 ` Ferruh Yigit
2019-09-16 16:52 ` Jan Remeš
2019-10-03 15:23 ` Ferruh Yigit
3 siblings, 1 reply; 10+ messages in thread
From: Ferruh Yigit @ 2019-09-16 15:34 UTC (permalink / raw)
To: Thomas Monjalon, bruce.richardson, Rastislav Cernay; +Cc: dev, Jan, Remes
On 9/14/2019 10:36 AM, Thomas Monjalon wrote:
> The libraries required for Netcope PMDs can be found in
> https://www.netcope.com/en/company/community-support/dpdk-libsze2
>
> These libraries are compatible with pkg-config, which is a better solution
> than directly looking for libraries and includes.
> These patches are using exclusively pkg-config with meson.
>
>
> Thomas Monjalon (2):
> net/nfb: fix dependency check
> net/szedata2: fix dependency check
>
+1 to this patch, unrelated to this patch I remember there was an issue with the
nfb & szedata2 dependencies, that their dependencies conflict with each other,
so it wasn't possible to enable both at the same time.
Jan, Rastislav,
Is it still the case, or is there any improvement there?
Thanks,
ferruh
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies
2019-09-16 15:34 ` [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Ferruh Yigit
@ 2019-09-16 16:52 ` Jan Remeš
0 siblings, 0 replies; 10+ messages in thread
From: Jan Remeš @ 2019-09-16 16:52 UTC (permalink / raw)
To: Ferruh Yigit; +Cc: Thomas Monjalon, bruce.richardson, Rastislav Cernay, dev
On Mon, Sep 16, 2019 at 5:34 PM Ferruh Yigit <ferruh.yigit@intel.com> wrote:
> +1 to this patch, unrelated to this patch I remember there was an issue with the
> nfb & szedata2 dependencies, that their dependencies conflict with each other,
> so it wasn't possible to enable both at the same time.
>
> Jan, Rastislav,
>
> Is it still the case, or is there any improvement there?
They work with the same hardware, they are (crudely and rudely
speaking) just mutually incompatible versions of the same thing (both
provide configuration access and data transfer for Netcope NFB family
of FPGA cards).
Therefore, there is no motivation to install both of them, "szedata2
(libsze2)" is deprecated and we only want to keep the PMD for existing
users. If it becomes a burden, we will phase it out eventually.
Regards,
Jan
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies
2019-09-14 9:36 [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Thomas Monjalon
` (2 preceding siblings ...)
2019-09-16 15:34 ` [dpdk-dev] [PATCH 0/2] use pkg-config to find Netcope dependencies Ferruh Yigit
@ 2019-10-03 15:23 ` Ferruh Yigit
3 siblings, 0 replies; 10+ messages in thread
From: Ferruh Yigit @ 2019-10-03 15:23 UTC (permalink / raw)
To: Thomas Monjalon, bruce.richardson; +Cc: dev
On 9/14/2019 10:36 AM, Thomas Monjalon wrote:
> The libraries required for Netcope PMDs can be found in
> https://www.netcope.com/en/company/community-support/dpdk-libsze2
>
> These libraries are compatible with pkg-config, which is a better solution
> than directly looking for libraries and includes.
> These patches are using exclusively pkg-config with meson.
>
>
> Thomas Monjalon (2):
> net/nfb: fix dependency check
> net/szedata2: fix dependency check
Series applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 10+ messages in thread