The following changes since commit d1a2b51f868d09ca8489ee9aee9c55632ed8fb92:
Merge remote-tracking branch 'remotes/berrange/tags/socket-next-pull-request' into staging (2020-08-25 15:01:43 +0100) are available in the Git repository at: https://gitlab.com/bonzini/qemu.git tags/for-upstream for you to fetch changes up to 666ab710f83c29966cca3a5d3ac2776c2b5f1afa ninjatool: Fixes E$$: in generated Makefile.ninja (2020-08-27 08:31:54 +0200) Since I am officially on vacation I don't have access to the full set of tests I run, but it passes both gitlab CI and the docker-mingw build. It does not include the submodule update for Meson 0.55.1. ---------------------------------------------------------------- meson fixes: * fix PIE default for Windows * tweak conditions for requiring SDL2 and pixman * move NSIS building to Meson * fix creation of systemtap files * add --ninja option for Windows builds * other fixes for stupid bugs and for Windows paths meson related: * forward port of dtrace fix for MacOS * change colorout option to auto ---------------------------------------------------------------- Bruce Rogers (2): meson: Fix meson build with --enable-libdaxctl meson: Fix chardev-baum.so name Daniel P. Berrangé (1): configure: default to PIE disabled on Windows platforms Gerd Hoffmann (1): meson: set colorout to auto Mark Cave-Ayland (1): meson: don't require CONFIG_VTE for the GTK UI Paolo Bonzini (5): meson: move pixman detection to meson meson: skip SDL2 detection if --disable-system configure: add --ninja option meson: cleanup xkbcommon detection ninjatool: quote dollars in variables Roman Bolshakov (1): meson: Don't make object files for dtrace on macOS Stefan Hajnoczi (1): trace: fix creation of systemtap files Thomas Huth (2): meson: Build qemu-nbd on macOS again scripts/qemu-version.sh: Add missing space before ']' Yonggang Luo (3): meson: fix relpath failure on Win32 meson: Mingw64 gcc doesn't recognize system include_type for sdl2 ninjatool: Fixes E$$: in generated Makefile.ninja chardev/meson.build | 2 +- configure | 39 +++++++++++---------- contrib/vhost-user-gpu/meson.build | 3 +- meson.build | 70 ++++++++++++++++++++++---------------- scripts/mtest2make.py | 11 ++++-- scripts/ninjatool.py | 5 +-- scripts/qemu-version.sh | 2 +- trace/meson.build | 13 ++++--- ui/meson.build | 6 ++-- 9 files changed, 87 insertions(+), 64 deletions(-) -- 2.26.2
