On 11/12/19 15:37, Samuel Thibault wrote: > Paolo Bonzini, le mer. 11 déc. 2019 15:23:23 +0100, a ecrit: >> When including the internal SLIRP library, we should add all the libraries >> that >> it needs for the build. Right now they are all included by QEMU, but >> -liphlpapi >> is not needed without slirp. Move it from LIBS to slirp_libs. >> >> Based on a patch by Marc-André Lureau. >> >> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > > Acked-by: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Ok, I'll queue it. But you could use "make docker-test-mingw@fedora". :) Paolo > (I don't have a win environment to test this) > >> --- >> configure | 5 ++++- >> 1 file changed, 4 insertions(+), 1 deletion(-) >> >> diff --git a/configure b/configure >> index 6099be1..d16dad2 100755 >> --- a/configure >> +++ b/configure >> @@ -926,7 +926,7 @@ if test "$mingw32" = "yes" ; then >> DSOSUF=".dll" >> # MinGW needs -mthreads for TLS and macro _MT. >> QEMU_CFLAGS="-mthreads $QEMU_CFLAGS" >> - LIBS="-lwinmm -lws2_32 -liphlpapi $LIBS" >> + LIBS="-lwinmm -lws2_32 $LIBS" >> write_c_skeleton; >> if compile_prog "" "-liberty" ; then >> LIBS="-liberty $LIBS" >> @@ -6069,6 +6069,9 @@ case "$slirp" in >> mkdir -p slirp >> slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" >> slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp" >> + if test "$mingw32" = "yes" ; then >> + slirp_libs="$slirp_libs -lws2_32 -liphlpapi" >> + fi >> ;; >> >> system) >> -- >> 1.8.3.1 >> >> >
