[v3,1/1] net/octeontx: fix meson build for disabled octeontx drivers
Checks
Commit Message
From: Amit Gupta <agupta3@marvell.com>
Add a condition to check if octeontx drivers are disabled.
octeontx drivers are built only if dependent drivers i.e.
ethdev, mempool and common/octeontx are enabled.
Bugzilla ID: 387
Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
Signed-off-by: Amit Gupta <agupta3@marvell.com>
---
drivers/net/octeontx/base/meson.build | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
Comments
On Wed, Mar 04, 2020 at 11:17:04AM +0530, agupta3@marvell.com wrote:
> From: Amit Gupta <agupta3@marvell.com>
>
> Add a condition to check if octeontx drivers are disabled.
> octeontx drivers are built only if dependent drivers i.e.
> ethdev, mempool and common/octeontx are enabled.
>
> Bugzilla ID: 387
>
> Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
>
> Signed-off-by: Amit Gupta <agupta3@marvell.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
On Wed, Mar 4, 2020 at 7:19 PM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> On Wed, Mar 04, 2020 at 11:17:04AM +0530, agupta3@marvell.com wrote:
> > From: Amit Gupta <agupta3@marvell.com>
> >
> > Add a condition to check if octeontx drivers are disabled.
> > octeontx drivers are built only if dependent drivers i.e.
> > ethdev, mempool and common/octeontx are enabled.
> >
> > Bugzilla ID: 387
> >
> > Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
> >
> > Signed-off-by: Amit Gupta <agupta3@marvell.com>
>
> Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
Applied to dpdk-next-net-mrvl/master. Thanks
On Wed, Mar 04, 2020 at 11:17:04AM +0530, agupta3@marvell.com wrote:
> From: Amit Gupta <agupta3@marvell.com>
>
> Add a condition to check if octeontx drivers are disabled.
> octeontx drivers are built only if dependent drivers i.e.
> ethdev, mempool and common/octeontx are enabled.
>
> Bugzilla ID: 387
>
> Fixes: 7f615033d64f ("drivers/net: build Cavium NIC PMDs with meson")
>
> Signed-off-by: Amit Gupta <agupta3@marvell.com>
Acked-by: Harman Kalra <hkalra@marvell.com>
> ---
> drivers/net/octeontx/base/meson.build | 5 ++++-
> 1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
> index a06a2c8..e1060fc 100644
> --- a/drivers/net/octeontx/base/meson.build
> +++ b/drivers/net/octeontx/base/meson.build
> @@ -10,7 +10,10 @@ sources = [
> depends = ['ethdev', 'mempool_octeontx']
> static_objs = []
> foreach d: depends
> - static_objs += [get_variable('static_rte_' + d)]
> + if not is_variable('shared_rte_' + d)
> + subdir_done()
> + endif
> + static_objs += get_variable('static_rte_' + d)
> endforeach
>
> c_args = cflags
> --
> 1.8.3.1
>
@@ -10,7 +10,10 @@ sources = [
depends = ['ethdev', 'mempool_octeontx']
static_objs = []
foreach d: depends
- static_objs += [get_variable('static_rte_' + d)]
+ if not is_variable('shared_rte_' + d)
+ subdir_done()
+ endif
+ static_objs += get_variable('static_rte_' + d)
endforeach
c_args = cflags