diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-08-03 17:50:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-08-03 17:50:29 +0100 |
| commit | 2cd9e2bd093a8b6f0e9fc6d75f4fd8f0e3250474 (patch) | |
| tree | 067fc3c673eeb680ca4b06c846d43d5254fbfe18 | |
| parent | acf8200722251a0a995cfa75fe5c15aea0886418 (diff) | |
| parent | 43f547b73dfaf108c9aaacb0b36200e2e7a200f1 (diff) | |
| download | qemu-2cd9e2bd093a8b6f0e9fc6d75f4fd8f0e3250474.zip qemu-2cd9e2bd093a8b6f0e9fc6d75f4fd8f0e3250474.tar.gz qemu-2cd9e2bd093a8b6f0e9fc6d75f4fd8f0e3250474.tar.bz2 | |
Merge remote-tracking branch 'remotes/elmarco/tags/libslirp-pull-request' into staging
Update libslirp
Hi,
v4:
- drop subproject patch
- fix OSX linking issue
v3:
- rebased
- (checked compilation with P. Maydell extra-cflags reported failure & gitlab CI)
v2:
- fix unused variables on macos
- fork_exec_child_setup: improve signal handling
# gpg: Signature made Tue 03 Aug 2021 15:17:39 BST
# gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
# gpg: issuer "marcandre.lureau@redhat.com"
# gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full]
# gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full]
# Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5
* remotes/elmarco/tags/libslirp-pull-request:
Update libslirp to v4.6.1
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | meson.build | 2 | ||||
| m--------- | slirp | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meson.build b/meson.build index f2e148e..af9bbb8 100644 --- a/meson.build +++ b/meson.build @@ -1824,6 +1824,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 -Subproject 8f43a99191afb47ca3f3c6972f6306209f367ec +Subproject a88d9ace234a24ce1c17189642ef9104799425e |