From: Samuel Thibault <samuel.thibault@gnu.org>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-devel@nongnu.org, qemu-trivial@nongnu.org
Subject: Re: [PATCH] build-sys: do not include Windows SLIRP dependencies in $LIBS
Date: Wed, 11 Dec 2019 15:37:22 +0100 [thread overview]
Message-ID: <20191211143722.a4co5wi53gylo2sr@function> (raw)
In-Reply-To: <1576074210-52834-2-git-send-email-pbonzini@redhat.com>
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 <pbonzini@redhat.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
(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" -+-
WARNING: multiple messages have this Message-ID (diff)
From: Samuel Thibault <samuel.thibault@gnu.org>
To: Paolo Bonzini <pbonzini@redhat.com>
Cc: qemu-trivial@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] build-sys: do not include Windows SLIRP dependencies in $LIBS
Date: Wed, 11 Dec 2019 15:37:22 +0100 [thread overview]
Message-ID: <20191211143722.a4co5wi53gylo2sr@function> (raw)
In-Reply-To: <1576074210-52834-2-git-send-email-pbonzini@redhat.com>
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 <pbonzini@redhat.com>
Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
(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" -+-
next prev parent reply other threads:[~2019-12-11 14:37 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 14:23 [PATCH] build-sys: do not include Windows SLIRP dependencies in $LIBS Paolo Bonzini
2019-12-11 14:37 ` Samuel Thibault [this message]
2019-12-11 14:37 ` Samuel Thibault
2019-12-11 15:06 ` Paolo Bonzini
2019-12-11 15:06 ` Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191211143722.a4co5wi53gylo2sr@function \
--to=samuel.thibault@gnu.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.