summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorPaolo Bonzini2021-02-09 14:59:26 +0100
committerPaolo Bonzini2021-10-05 13:10:29 +0200
commit654d6b0453aa6eb19af0d75b0f087a97a5776da7 (patch)
tree7d609d2d6c7ccb384af6b1596cb530dd82d2e749 /plugins
parentmeson: bump submodule to 0.59.2 (diff)
downloadqemu-654d6b0453aa6eb19af0d75b0f087a97a5776da7.tar.gz
qemu-654d6b0453aa6eb19af0d75b0f087a97a5776da7.tar.xz
qemu-654d6b0453aa6eb19af0d75b0f087a97a5776da7.zip
meson: switch minimum meson version to 0.58.2, minimum recommended to 0.59.2
Meson 0.58.2 does not need b_staticpic=$pie anymore, and has stabilized the keyval module. Remove the workaround and use a few replacements for features deprecated in the 0.57.0 release cycle. One feature that we would like to use is passing dependencies to summary. However, that was broken in 0.59.0 and 0.59.1. Therefore, use the embedded Meson if the host has anything older than 0.59.2, but allow --meson= to use 0.58.2. Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/meson.build b/plugins/meson.build
index bfd5c9822a..aeb386ebae 100644
--- a/plugins/meson.build
+++ b/plugins/meson.build
@@ -2,9 +2,9 @@ plugin_ldflags = []
# Modules need more symbols than just those in plugins/qemu-plugins.symbols
if not enable_modules
if 'CONFIG_HAS_LD_DYNAMIC_LIST' in config_host
- plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.build_root() / 'qemu-plugins-ld.symbols')]
+ plugin_ldflags = ['-Wl,--dynamic-list=' + (meson.project_build_root() / 'qemu-plugins-ld.symbols')]
elif 'CONFIG_HAS_LD_EXPORTED_SYMBOLS_LIST' in config_host
- plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.build_root() / 'qemu-plugins-ld64.symbols')]
+ plugin_ldflags = ['-Wl,-exported_symbols_list,' + (meson.project_build_root() / 'qemu-plugins-ld64.symbols')]
endif
endif