summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini2021-12-23 15:29:56 +0100
committerPaolo Bonzini2022-10-01 21:16:36 +0200
commit8a29c20597f98e20c7390300b63fa6ac7d3ad6dd (patch)
treeb47a1bb7911920936b020a776c0b63b7e20ae45b /configure
parentmeson: -display dbus and CFI are incompatible (diff)
downloadqemu-8a29c20597f98e20c7390300b63fa6ac7d3ad6dd.tar.gz
qemu-8a29c20597f98e20c7390300b63fa6ac7d3ad6dd.tar.xz
qemu-8a29c20597f98e20c7390300b63fa6ac7d3ad6dd.zip
meson: require 0.61.3
This removes the dependency of dbus-display on --enable-modules. It also allows cleanups in modinfo collection and allows moving C++ compiler detection to meson.build. Because it is now deprecated to use install_subdir to create an empty directory, replace it with install_emptydir. Updating the Meson submodule to 0.61.5 also removes the message WARNING: Broken python installation detected. Python files installed by Meson might not be found by python interpreter. unless using system meson is forced with --meson. Resolves: https://gitlab.com/qemu-project/qemu/-/issues/873 Resolves: https://gitlab.com/qemu-project/qemu/-/issues/848 Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 894e37310f..c5069775db 100755
--- a/configure
+++ b/configure
@@ -1114,7 +1114,7 @@ fi
python="$python -B"
if test -z "$meson"; then
- if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.59.3; then
+ if test "$explicit_python" = no && has meson && version_ge "$(meson --version)" 0.61.5; then
meson=meson
elif test "$git_submodules_action" != 'ignore' ; then
meson=git