[dpdk-dev] [PATCH] build: fix compatibility with meson 0.47

Luca Boccassi bluca at debian.org
Thu Oct 24 14:17:20 CEST 2019


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 at 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 at debian.org>

-- 
Kind regards,
Luca Boccassi


More information about the dev mailing list