build: fix compatibility with meson 0.47
PATCH 1/1 build: fix compatibility with meson 0.47
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 <[email protected]>
--- drivers/meson.build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/meson.build +9 -4
@@ -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
Signature · 1 line
2.21.0
Quoted 35 lines · 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 <
[email protected]Quoted 1 line
--- drivers/meson.build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)drivers/meson.build +0
-0@@ -61,10 +61,15 @@ foreach class:dpdk_driver_classes # pull in driver directory which should assign to eachof the above
drivers/meson.build +1
-4subdir(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 touse
drivers/meson.build +5
-0+ # "in" keyword + foreach disable_path: disabled_drivers + if drv_path == disable_path + build = false + reason = 'Explicitly disabled via buildconfig'
drivers/meson.build foreach class:dpdk_driver_classes · line 75
Quoted 6 lines
drivers/meson.build +3
-0+ endif + endforeach + if build # get dependency objs from strings shared_deps = ext_deps static_deps = ext_deps
Acked-by Luca Boccassi <[email protected]>
Signature · 2 lines
Kind regards, Luca Boccassi
Thomas Monjalon
Applied24/10/2019 14:17, Luca Boccassi:
Quoted 9 lines · Bruce Richardson
Quoted 6 lines
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 <[email protected]>Acked-by Luca Boccassi <[email protected]>
Applied, thanks