On Thu, Sep 10, 2020 at 4:08 AM Paolo Bonzini <pbonz...@redhat.com> wrote:

>
>
> Il mer 9 set 2020, 20:43 Yonggang Luo <luoyongg...@gmail.com> ha scritto:
>
>> So we can removal usage of unstable-keyval
>>
>
> Isn't it stable only on 0.56.0?
>
> Paolo
>
On Windows, there is following warning:   WARNING: Module unstable-keyval
is now stable, please use the keyval module instead.
NOTE: guest cross-compilers enabled: cc
Using 'PKG_CONFIG_PATH' from environment with value:
'C:\\CI-Tools\\msys64\\mingw64\\lib\\pkgconfig;C:\\CI-Tools\\msys64\\mingw64\\share\\pkgconfig'
Using 'PKG_CONFIG_PATH' from environment with value:
'C:\\CI-Tools\\msys64\\mingw64\\lib\\pkgconfig;C:\\CI-Tools\\msys64\\mingw64\\share\\pkgconfig'
The Meson build system
Version: 0.55.999
Source dir: C:/work/xemu/qemu
Build dir: C:/work/xemu/qemu/build
Build type: native build
Project name: qemu
Project version: 5.1.50
C compiler for the host machine: cc (gcc 10.2.0 "cc (Rev1, Built by MSYS2
project) 10.2.0")
C linker for the host machine: cc ld.bfd 2.35
Host machine cpu family: x86_64
Host machine cpu: x86_64
WARNING: Module unstable-keyval is now stable, please use the keyval module
instead.
Program sh found: YES

But when I commit this patch to running CI, osx are failing, so there is
problem with this patch, sorry for that. this patch need to be discard

>
>
>> Signed-off-by: Yonggang Luo <luoyongg...@gmail.com>
>> ---
>>  meson.build | 9 +++------
>>  1 file changed, 3 insertions(+), 6 deletions(-)
>>
>> 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
>>
>>

-- 
         此致
礼
罗勇刚
Yours
    sincerely,
Yonggang Luo

Reply via email to