On Thu, Sep 10, 2020 at 02:42:37AM +0800, Yonggang Luo wrote:
> So we can removal usage of unstable-keyval
>
> Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
> ---
> meson.build | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
This prevents the use on Fedora which has 0.55.0 only. This is not
desirable merely to remove a functionally harmless warning.
>
> diff --git a/meson.build b/meson.build
> index 0b1741557d..af34a85bec 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1,14 +1,11 @@
> -project('qemu', ['c'], meson_version: '>=0.55.0',
> +project('qemu', ['c'], meson_version: '>=0.55.1',
> default_options: ['warning_level=1', 'c_std=gnu99',
> 'cpp_std=gnu++11',
> 'b_colorout=auto'],
> version: run_command('head', meson.source_root() /
> 'VERSION').stdout().strip())
>
> not_found = dependency('', required: false)
> -if meson.version().version_compare('>=0.56.0')
> - keyval = import('keyval')
> -else
> - keyval = import('unstable-keyval')
> -endif
> +keyval = import('keyval')
> +
> ss = import('sourceset')
>
> sh = find_program('sh')
> --
> 2.28.0.windows.1
>
>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
