From: Joelle van Dyne <j@getutm.app>
To: qemu-devel@nongnu.org
Cc: Joelle van Dyne <j@getutm.app>
Subject: [PATCH 05/10] slirp: update for iOS resolv fix
Date: Mon, 12 Oct 2020 16:29:34 -0700 [thread overview]
Message-ID: <20201012232939.48481-6-j@getutm.app> (raw)
In-Reply-To: <20201012232939.48481-1-j@getutm.app>
From: osy <osy86@users.noreply.github.com>
We cannot access /etc/resolv.conf on iOS so libslirp is modified to use
libresolv instead.
Signed-off-by: Joelle van Dyne <j@getutm.app>
---
.gitmodules | 2 +-
meson.build | 2 ++
slirp | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 2bdeeacef8..f23e859210 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -51,7 +51,7 @@
url = https://git.qemu.org/git/edk2.git
[submodule "slirp"]
path = slirp
- url = https://git.qemu.org/git/libslirp.git
+ url = https://github.com/utmapp/libslirp.git
[submodule "roms/opensbi"]
path = roms/opensbi
url = https://git.qemu.org/git/opensbi.git
diff --git a/meson.build b/meson.build
index 32cf08619f..da96e296e0 100644
--- a/meson.build
+++ b/meson.build
@@ -996,6 +996,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])
diff --git a/slirp b/slirp
index ce94eba204..452c389d82 160000
--- a/slirp
+++ b/slirp
@@ -1 +1 @@
-Subproject commit ce94eba2042d52a0ba3d9e252ebce86715e94275
+Subproject commit 452c389d8288f81ec9d59d983a047d4e54f3194e
--
2.24.3 (Apple Git-128)
next prev parent reply other threads:[~2020-10-13 1:04 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 23:29 [PATCH 00/10] iOS and Apple Silicon host support Joelle van Dyne
2020-10-12 23:29 ` [PATCH 01/10] configure: option to disable host block devices Joelle van Dyne
2020-10-12 23:29 ` [PATCH 02/10] configure: cross-compiling without cross_prefix Joelle van Dyne
2020-10-12 23:29 ` [PATCH 03/10] qemu: add support for iOS host Joelle van Dyne
2020-10-12 23:29 ` [PATCH 04/10] meson: option to build as shared library Joelle van Dyne
2020-10-13 7:51 ` Daniel P. Berrangé
2020-10-13 14:41 ` BALATON Zoltan via
2020-10-13 14:46 ` Daniel P. Berrangé
2020-10-13 15:16 ` Joelle van Dyne
2020-10-13 15:57 ` Daniel P. Berrangé
2020-10-13 16:40 ` BALATON Zoltan via
2020-10-14 16:09 ` Joelle van Dyne
2020-10-13 15:23 ` BALATON Zoltan via
2020-10-12 23:29 ` Joelle van Dyne [this message]
2020-10-13 13:32 ` [PATCH 05/10] slirp: update for iOS resolv fix Philippe Mathieu-Daudé
2020-10-13 14:38 ` Marc-André Lureau
2020-10-13 14:59 ` Philippe Mathieu-Daudé
2020-10-14 15:54 ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 06/10] coroutine: add libucontext as external library Joelle van Dyne
2020-10-13 13:31 ` Stefan Hajnoczi
2020-10-13 14:49 ` BALATON Zoltan via
2020-10-13 15:25 ` Joelle van Dyne
2020-10-13 16:18 ` Daniel P. Berrangé
2020-10-12 23:29 ` [PATCH 07/10] tcg: implement bulletproof JIT Joelle van Dyne
2020-10-13 8:22 ` Philippe Mathieu-Daudé
2020-10-13 14:58 ` BALATON Zoltan via
2020-10-14 16:03 ` Joelle van Dyne
2020-10-14 20:35 ` Richard Henderson
2020-10-14 20:54 ` BALATON Zoltan via
2020-10-14 21:40 ` Richard Henderson
2020-10-14 20:58 ` Joelle van Dyne
2020-10-14 21:08 ` BALATON Zoltan via
2020-10-14 21:49 ` Richard Henderson
2020-10-14 22:54 ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 08/10] tcg: mirror mapping RWX pages for iOS optional Joelle van Dyne
2020-10-13 13:52 ` Paolo Bonzini
2020-10-13 15:10 ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 09/10] tcg: support JIT on Apple Silicon Joelle van Dyne
2020-10-13 13:55 ` Paolo Bonzini
2020-10-13 14:09 ` Peter Maydell
2020-10-13 15:13 ` Joelle van Dyne
2020-10-12 23:29 ` [PATCH 10/10] block: check availablity for preadv/pwritev on mac Joelle van Dyne
2020-10-13 1:21 ` [PATCH 00/10] iOS and Apple Silicon host support no-reply
2020-10-13 2:12 ` Joelle van Dyne
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=20201012232939.48481-6-j@getutm.app \
--to=j@getutm.app \
--cc=qemu-devel@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).