build: fix compatibility with meson 0.47
authorBruce Richardson <bruce.richardson@intel.com>
Thu, 24 Oct 2019 10:41:08 +0000 (11:41 +0100)
committerThomas Monjalon <thomas@monjalon.net>
Fri, 25 Oct 2019 07:45:51 +0000 (09:45 +0200)
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>
drivers/meson.build

index 4a1cb8b..156d2dc 100644 (file)
@@ -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