[Spice-devel] [PATCH spice-server 1/2] Bump meson requirement to 0.47.2

Frediano Ziglio fziglio at redhat.com
Tue Sep 25 20:41:59 UTC 2018


> 
> This new version ships the fix for the issue where 'check' keyword could
> not be used in project definition, so we had to run that command again
> only to check if it succeeded.
> 
> https://github.com/mesonbuild/meson/issues/3944
> 
> Signed-off-by: Eduardo Lima (Etrunko) <etrunko at redhat.com>
> ---
>  meson.build | 13 ++-----------
>  1 file changed, 2 insertions(+), 11 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index 762f1d1c..3184a6f5 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2,22 +2,13 @@
>  # project definition
>  #
>  project('spice', 'c',
> -        version : run_command('build-aux/git-version-gen',
> '${MESON_SOURCE_ROOT}/.tarball-version').stdout().strip(),
> +        version : run_command('build-aux/git-version-gen',
> '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(),
>          license : 'LGPLv2.1',
> -        meson_version : '>= 0.47.0')
> -
> -# double check meson.project_version()
> -# we can not use 'check' keyword in run_command() for git-version-gen above
> -# https://github.com/mesonbuild/meson/issues/3944
> -version = run_command('build-aux/git-version-gen',
> '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip()
> -if meson.project_version() != version
> -  error('Wrong project version')
> -endif
> +        meson_version : '>= 0.47.2')
>  
>  message('Updating submodules')
>  run_command('build-aux/meson/check-spice-common', check : true)
>  
> -
>  #
>  # soversion
>  # The versioning is defined by the forumla (CURRENT-AGE.AGE.REVISION)

Good, works for me.

Acked

Frediano


More information about the Spice-devel mailing list