On Sat, 23 Jan 2021 at 14:36, Paolo Bonzini <pbonz...@redhat.com> wrote: > > The following changes since commit fef80ea073c4862bc9eaddb6ddb0ed970b8ad7c4: > > Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2021-01-20' into > staging (2021-01-21 10:44:28 +0000) > > are available in the Git repository at: > > https://gitlab.com/bonzini/qemu.git tags/for-upstream > > for you to fetch changes up to fc70d67e73e9cba950cf9d16281a78eb4ab6e4ce: > > qemu-option: warn for short-form boolean options (2021-01-23 09:29:42 -0500) > > ---------------------------------------------------------------- > * Make MinGW respect --bindir (Joshua) > * Switch MinGW to a "deep" installation (Joshua + NSIS fixes by myself) > * Fix compilation errors/warnings (Qixin, Philippe) > * Switch slirp to a subproject (Marc-André) > * QemuOpts cleanups (myself) > * Consistency improvements for -action (myself) > * remove deprecated "change vnc TARGET" functionality (myself) > * meson cleanups (Philippe, myself) > * IDE out-of-bounds access (Prasad) > * LA57 fix for -cpu max (Weijiang)
Fails to compile, OSX. There's an oddball "unable to rmdir" warning immediately on git checkout, which may or may not be related: >From git://git-us.linaro.org/people/pmaydell/qemu-arm e93c65a6c6..9bfe4825ae staging -> pmaydell/staging warning: unable to rmdir 'slirp': Directory not empty make: Entering directory '/Users/pm215/src/qemu-for-merges/build/all' config-host.mak is out-of-date, running configure Disabling PIE due to missing toolchain support Submodule 'subprojects/libslirp' (https://git.qemu.org/git/libslirp.git) registered for path 'subprojects/libslirp' Cloning into '/Users/pm215/src/qemu-for-merges/subprojects/libslirp'... cross containers no NOTE: guest cross-compilers enabled: cc /usr/local/bin/ninja build.ninja && touch build.ninja.stamp [...] ninja: no work to do. /usr/local/bin/python3 -B /Users/pm215/src/qemu-for-merges/meson/meson.py introspect --targets --tests --benchmarks | /usr/local/bin/python3 -B scripts/mtest2make.py > Makefile.mtest [1/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_ip_output.c.o [2/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_ncsi.c.o [3/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_mbuf.c.o [4/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_misc.c.o [5/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o FAILED: subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o cc -Isubprojects/libslirp/libslirp.0.dylib.p -Isubprojects/libslirp -I../../subprojects/libslirp -I/usr/local/Cellar/glib/2.66.1/include -I/usr/local/Cellar/glib/2.66.1/include/glib-2.0 -I/usr/local/Cellar/glib/2.66.1/lib/glib-2.0/include -I/usr/local/opt/gettext/include -I/usr/local/Cellar/pcre/8.44/include -Xclang -fcolor-diagnostics -pipe -Wall -Winvalid-pch -std=gnu99 -O2 -g -m64 -mcx16 -DOS_OBJECT_USE_OBJC=0 -arch x86_64 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes -Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes -fno-strict-aliasing -fno-common -fwrapv -fdiagnostics-color=never -Werror -Wno-error=deprecated-declarations -Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self -Wignored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels -Wexpansion-to-defined -Wno-initializer-overrides -Wno-missing-include-dirs -Wno-shift-negative-value -Wno-string-plus-int -Wno-typedef-redefinition -Wno-tautological-type-limit-compare -fstack-protector-strong '-DG_LOG_DOMAIN="Slirp"' -MD -MQ subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o -MF subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o.d -o subprojects/libslirp/libslirp.0.dylib.p/src_slirp.c.o -c ../../subprojects/libslirp/src/slirp.c ../../subprojects/libslirp/src/slirp.c:131:17: error: unused variable 'old_stat' [-Werror,-Wunused-variable] struct stat old_stat; ^ ../../subprojects/libslirp/src/slirp.c:143:10: error: unused variable 'buff' [-Werror,-Wunused-variable] char buff[512]; ^ 2 errors generated. [6/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_sbuf.c.o [7/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_ndp_table.c.o [8/5915] Compiling C object subprojects/libslirp/libslirp.0.dylib.p/src_socket.c.o ninja: build stopped: subcommand failed. thanks -- PMM