| Message ID | 20201216162006.433850-3-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | First round of meson bugfixes and cleanups for 6.0 | expand |
On Wed, Dec 16, 2020 at 8:25 PM Paolo Bonzini <pbonzini@redhat.com> wrote: > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> --- > configure | 2 +- > meson | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configure b/configure > index 6317964997..8d12b715e3 100755 > --- a/configure > +++ b/configure > @@ -1938,7 +1938,7 @@ python_version=$($python -c 'import sys; > print("%d.%d.%d" % (sys.version_info[0] > python="$python -B" > > if test -z "$meson"; then > - if test "$explicit_python" = no && has meson && version_ge "$(meson > --version)" 0.55.3; then > + if test "$explicit_python" = no && has meson && version_ge "$(meson > --version)" 0.56.0; then > meson=meson > elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then > meson=git > diff --git a/meson b/meson > index 776acd2a80..f16d31607e 160000 > --- a/meson > +++ b/meson > @@ -1 +1 @@ > -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f > +Subproject commit f16d31607eb3cd0f281758bd0944e206ef6be387 > -- > 2.29.2 > > > >
diff --git a/configure b/configure index 6317964997..8d12b715e3 100755 --- a/configure +++ b/configure @@ -1938,7 +1938,7 @@ python_version=$($python -c 'import sys; print("%d.%d.%d" % (sys.version_info[0] python="$python -B" if test -z "$meson"; then - if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.55.3; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.56.0; then meson=meson elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then meson=git diff --git a/meson b/meson index 776acd2a80..f16d31607e 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 776acd2a805c9b42b4f0375150977df42130317f +Subproject commit f16d31607eb3cd0f281758bd0944e206ef6be387
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- configure | 2 +- meson | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)