From 6ebd89cf9ca3f5a6948542c4522b9380b1e9539f Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 15 Oct 2020 03:20:45 -0400 Subject: [PATCH] submodules: bump meson to 0.55.3 This adds some bugfixes, and allows MSYS2 to configure without "--ninja=ninja". Signed-off-by: Paolo Bonzini --- .cirrus.yml | 3 +-- configure | 2 +- meson | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 99d118239c..0f46cb5eaf 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -123,8 +123,7 @@ windows_msys2_task: script: - C:\tools\msys64\usr\bin\bash.exe -lc "mkdir build" - - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure - --python=python3 --ninja=ninja" + - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && ../configure --python=python3" - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make -j8" test_script: - C:\tools\msys64\usr\bin\bash.exe -lc "cd build && make V=1 check" diff --git a/configure b/configure index f839c2a557..df412c4b62 100755 --- a/configure +++ b/configure @@ -1866,7 +1866,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.1; then + if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.55.3; then meson=meson elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then meson=git diff --git a/meson b/meson index 68ed748f84..776acd2a80 160000 --- a/meson +++ b/meson @@ -1 +1 @@ -Subproject commit 68ed748f84f14c2d4e62dcbd123816e5898eb04c +Subproject commit 776acd2a805c9b42b4f0375150977df42130317f -- 2.11.4.GIT