mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
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>
This commit is contained in:
@@ -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])
|
||||
|
||||
+1
-1
Submodule slirp updated: 8f43a99191...a88d9ace23
Reference in New Issue
Block a user