[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] build-sys: do not include Windows SLIRP dependencies in $LIB
From: |
Samuel Thibault |
Subject: |
Re: [PATCH] build-sys: do not include Windows SLIRP dependencies in $LIBS |
Date: |
Wed, 11 Dec 2019 15:37:22 +0100 |
User-agent: |
NeoMutt/20170609 (1.8.3) |
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 <address@hidden>
Acked-by: Samuel Thibault <address@hidden>
(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
>
>
--
Samuel
> Quelqu'un aurait-il une solution pour réinitialiser un MBR
Si tu veux qu'il soit complètement blanc (pas souhaitable, à mon avis) :
dd if=/dev/zero of=/dev/hda bs=512 count=1 (sous Linux)
-+- OT in Guide du linuxien (très) pervers - "Pour les K difficiles" -+-