[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/10] slirp: update for iOS resolv fix
From: |
Joelle van Dyne |
Subject: |
[PATCH 05/10] slirp: update for iOS resolv fix |
Date: |
Mon, 12 Oct 2020 16:29:34 -0700 |
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)
- Re: [PATCH 09/10] tcg: support JIT on Apple Silicon, (continued)
[PATCH 02/10] configure: cross-compiling without cross_prefix, Joelle van Dyne, 2020/10/12
[PATCH 03/10] qemu: add support for iOS host, Joelle van Dyne, 2020/10/12
[PATCH 06/10] coroutine: add libucontext as external library, Joelle van Dyne, 2020/10/12
[PATCH 05/10] slirp: update for iOS resolv fix,
Joelle van Dyne <=
[PATCH 07/10] tcg: implement bulletproof JIT, Joelle van Dyne, 2020/10/12