* [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47
@ 2019-10-24 10:41 Bruce Richardson
2019-10-24 12:17 ` Luca Boccassi
0 siblings, 1 reply; 3+ messages in thread
From: Bruce Richardson @ 2019-10-24 10:41 UTC (permalink / raw)
To: thomas; +Cc: bluca, dev, Bruce Richardson
The "in" keyword was introduced in meson 0.49, which means we need to use
an old-fashioned loop to check the array of disabled drivers.
Fixes: 6f80f1cd2247 ("build: support disabling drivers with meson")
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/meson.build | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index 4a1cb8b5b..156d2dc71 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -61,10 +61,15 @@ foreach class:dpdk_driver_classes
# pull in driver directory which should assign to each of the above
subdir(drv_path)
- if drv_path in disabled_drivers
- build = false
- reason = 'Explicitly disabled via build config'
- elif build
+ # skip disabled drivers. For meson 0.49 change this to use
+ # "in" keyword
+ foreach disable_path: disabled_drivers
+ if drv_path == disable_path
+ build = false
+ reason = 'Explicitly disabled via build config'
+ endif
+ endforeach
+ if build
# get dependency objs from strings
shared_deps = ext_deps
static_deps = ext_deps
--
2.21.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47
2019-10-24 10:41 [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47 Bruce Richardson
@ 2019-10-24 12:17 ` Luca Boccassi
2019-10-25 7:44 ` Thomas Monjalon
0 siblings, 1 reply; 3+ messages in thread
From: Luca Boccassi @ 2019-10-24 12:17 UTC (permalink / raw)
To: Bruce Richardson, thomas; +Cc: dev
On Thu, 2019-10-24 at 11:41 +0100, Bruce Richardson wrote:
> The "in" keyword was introduced in meson 0.49, which means we need to
> use
> an old-fashioned loop to check the array of disabled drivers.
>
> Fixes: 6f80f1cd2247 ("build: support disabling drivers with meson")
>
> Signed-off-by: Bruce Richardson <
> bruce.richardson@intel.com
> >
> ---
> drivers/meson.build | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/meson.build b/drivers/meson.build
> index 4a1cb8b5b..156d2dc71 100644
> --- a/drivers/meson.build
> +++ b/drivers/meson.build
> @@ -61,10 +61,15 @@ foreach class:dpdk_driver_classes
> # pull in driver directory which should assign to each
> of the above
> subdir(drv_path)
>
> - if drv_path in disabled_drivers
> - build = false
> - reason = 'Explicitly disabled via build config'
> - elif build
> + # skip disabled drivers. For meson 0.49 change this to
> use
> + # "in" keyword
> + foreach disable_path: disabled_drivers
> + if drv_path == disable_path
> + build = false
> + reason = 'Explicitly disabled via build
> config'
> + endif
> + endforeach
> + if build
> # get dependency objs from strings
> shared_deps = ext_deps
> static_deps = ext_deps
>
Acked-by: Luca Boccassi <bluca@debian.org>
--
Kind regards,
Luca Boccassi
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47
2019-10-24 12:17 ` Luca Boccassi
@ 2019-10-25 7:44 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2019-10-25 7:44 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev, Luca Boccassi
24/10/2019 14:17, Luca Boccassi:
> On Thu, 2019-10-24 at 11:41 +0100, Bruce Richardson wrote:
> > The "in" keyword was introduced in meson 0.49, which means we need to
> > use an old-fashioned loop to check the array of disabled drivers.
> >
> > Fixes: 6f80f1cd2247 ("build: support disabling drivers with meson")
> >
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
>
> Acked-by: Luca Boccassi <bluca@debian.org>
Applied, thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-10-25 7:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-24 10:41 [dpdk-dev] [PATCH] build: fix compatibility with meson 0.47 Bruce Richardson
2019-10-24 12:17 ` Luca Boccassi
2019-10-25 7:44 ` Thomas Monjalon
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).