| Message ID | 20221209112409.184703-9-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Meson changes for QEMU 8.0 | expand |
On 09/12/2022 12.23, Paolo Bonzini wrote: > This allows cleanups cleanups in modinfo collection and supports the Scratch one "cleanups" ? > equivalent of QEMU's --static option to configure. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > configure | 2 +- > meson | 2 +- > meson.build | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/configure b/configure index adfff30a6204..411dfe977958 100755 --- a/configure +++ b/configure @@ -1043,7 +1043,7 @@ fi python="$python -B" if test -z "$meson"; then - if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.61.5; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.63.0; then meson=meson elif test "$git_submodules_action" != 'ignore' ; then meson=git diff --git a/meson b/meson index 3a9b285a55b9..9c6dab2cfd31 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 3a9b285a55b91b53b2acda987192274352ecb5be +Subproject commit 9c6dab2cfd310ef2d840a2a7a479ce6b9e563b1d diff --git a/meson.build b/meson.build index dbd0b5563446..19b023985325 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('qemu', ['c'], meson_version: '>=0.61.3', +project('qemu', ['c'], meson_version: '>=0.63.0', default_options: ['warning_level=1', 'c_std=gnu11', 'cpp_std=gnu++11', 'b_colorout=auto', 'b_staticpic=false', 'stdsplit=false', 'optimization=2', 'b_pie=true'], version: files('VERSION'))
This allows cleanups cleanups in modinfo collection and supports the equivalent of QEMU's --static option to configure. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- configure | 2 +- meson | 2 +- meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)