From a7bdb568c3e943dd0a533c10e5e2784e00e2984e Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 24 Oct 2019 11:41:08 +0100 Subject: [PATCH] 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 Acked-by: Luca Boccassi --- drivers/meson.build | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 4a1cb8b5be..156d2dc717 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.20.1