Ping, Paolo: Peter confirmed he'd updated his mingw cross env now, so should be safe to include this in a PULL before soft-freeze on tuesday.
On Fri, Jun 08, 2018 at 02:16:01PM +0100, Daniel P. Berrangé wrote: > The previous patch to bump glib to 2.42 hit problems with Peter's build > environment for testing merge: > > https://lists.gnu.org/archive/html/qemu-devel/2018-05/msg02557.html > > This posting drops back to 2.40, which allows Ubuntu 14.04 from GLibC > compile farm to be supported. > > It does NOT try to go back to 2.34, because it is hoped that the mxe.cc > Debian packages will be suitable for Peter to test Windows > cross-compile. Alternatively the docker environments provided in tree > can be used for mingw build testing on any host able to run docker. > > I also dropped some more GLIB_CHECK_VERSION checks that are redundant > given the new min version. > > Changed in v3: > > - Use #pragma instead of _Pragma > - Move dockerfile deletion to earlier patch > - Add missing osdep.h include > - Reorder patches to preserve bisectability > > Daniel P. Berrangé (3): > util: remove redundant include of glib.h and add osdep.h > glib: bump min required glib library version to 2.40 > glib: enforce the minimum required version and warn about old APIs > > configure | 6 +- > crypto/hash-glib.c | 4 - > crypto/hmac-glib.c | 36 --- > include/glib-compat.h | 373 ++++------------------- > include/qemu/iova-tree.h | 1 - > qga/commands.c | 11 +- > tests/docker/dockerfiles/centos6.docker | 30 -- > tests/docker/dockerfiles/min-glib.docker | 8 - > tests/ivshmem-test.c | 6 - > tests/test-qga.c | 2 - > tests/test-qmp-event.c | 8 +- > tests/tpm-emu.h | 4 +- > tests/vhost-user-test.c | 26 +- > trace/simple.c | 6 +- > util/iova-tree.c | 2 +- > util/osdep.c | 14 - > 16 files changed, 73 insertions(+), 464 deletions(-) > delete mode 100644 tests/docker/dockerfiles/centos6.docker > delete mode 100644 tests/docker/dockerfiles/min-glib.docker > > -- > 2.17.0 > Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|