diff mbox series

[v6,6/7] slirp: update build flags for iOS resolv fix

Message ID 20210105022055.12113-7-j@getutm.app (mailing list archive)
State New, archived
Headers show
Series iOS and Apple Silicon host support | expand

Commit Message

Joelle van Dyne Jan. 5, 2021, 2:20 a.m. UTC
A future libslirp update will use libresolv on Darwin systems, so we add the
flags in QEMU build now.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Joelle van Dyne <j@getutm.app>
---
 meson.build | 2 ++
 1 file changed, 2 insertions(+)

Comments

Philippe Mathieu-Daudé Jan. 12, 2021, 11:52 a.m. UTC | #1
Hi Joelle,

On 1/5/21 3:20 AM, Joelle van Dyne wrote:
> A future libslirp update will use libresolv on Darwin systems, so we add the
> flags in QEMU build now.
> 
> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> Signed-off-by: Joelle van Dyne <j@getutm.app>
> ---
>  meson.build | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/meson.build b/meson.build
> index 900dbc36c8..d8951d4d6c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1205,6 +1205,8 @@ if have_system
>      slirp_deps = []
>      if targetos == 'windows'
>        slirp_deps = cc.find_library('iphlpapi')
> +    elif targetos == 'darwin'
> +      slirp_deps = cc.find_library('resolv')

This is done in libSLiRP commit 9f82a47 ("Add DNS resolving for iOS").

Maybe this commit need to be backported in the stable branch,
or QEMU should use a newer commit. Cc'ing Samuel and Marc-André
who maintain the project (and the SLiRP list).

>      endif
>      slirp_conf = configuration_data()
>      slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.')[0])
>
Marc-André Lureau Jan. 14, 2021, 11:07 a.m. UTC | #2
Hi

On Tue, Jan 12, 2021 at 3:52 PM Philippe Mathieu-Daudé <philmd@redhat.com>
wrote:

> Hi Joelle,
>
> On 1/5/21 3:20 AM, Joelle van Dyne wrote:
> > A future libslirp update will use libresolv on Darwin systems, so we add
> the
> > flags in QEMU build now.
> >
> > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
> > Signed-off-by: Joelle van Dyne <j@getutm.app>
> > ---
> >  meson.build | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/meson.build b/meson.build
> > index 900dbc36c8..d8951d4d6c 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -1205,6 +1205,8 @@ if have_system
> >      slirp_deps = []
> >      if targetos == 'windows'
> >        slirp_deps = cc.find_library('iphlpapi')
> > +    elif targetos == 'darwin'
> > +      slirp_deps = cc.find_library('resolv')
>
> This is done in libSLiRP commit 9f82a47 ("Add DNS resolving for iOS").
>
> Maybe this commit need to be backported in the stable branch,
> or QEMU should use a newer commit. Cc'ing Samuel and Marc-André
> who maintain the project (and the SLiRP list).
>

Yes, I am going to send an update to git upstream.

thanks
diff mbox series

Patch

diff --git a/meson.build b/meson.build
index 900dbc36c8..d8951d4d6c 100644
--- a/meson.build
+++ b/meson.build
@@ -1205,6 +1205,8 @@  if have_system
     slirp_deps = []
     if targetos == 'windows'
       slirp_deps = cc.find_library('iphlpapi')
+    elif targetos == 'darwin'
+      slirp_deps = cc.find_library('resolv')
     endif
     slirp_conf = configuration_data()
     slirp_conf.set('SLIRP_MAJOR_VERSION', meson.project_version().split('.')[0])