d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: fix compatibility with meson 0.47

Browse Source 
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: 6f80f1cd22 ("build: support disabling drivers with meson")

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
This commit is contained in:
Bruce Richardson 2019-10-24 11:41:08 +01:00 committed by Thomas Monjalon
parent 157e55f82d
commit a7bdb568c3
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/meson.build
View File

@ -61,10 +61,15 @@ foreach class:dpdk_driver_classes
# pull in driver directory which should assign to each of the above # pull in driver directory which should assign to each of the above
subdir(drv_path) subdir(drv_path)
if drv_path in disabled_drivers # skip disabled drivers. For meson 0.49 change this to use
build = false # "in" keyword
reason = 'Explicitly disabled via build config' foreach disable_path: disabled_drivers
elif build if drv_path == disable_path
build = false
reason = 'Explicitly disabled via build config'
endif
endforeach
if build
# get dependency objs from strings # get dependency objs from strings
shared_deps = ext_deps shared_deps = ext_deps
static_deps = ext_deps static_deps = ext_deps