haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update libslirp

Browse source 
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
 -----BEGIN PGP SIGNATURE-----
 
 iQJQBAABCAA6FiEEh6m9kz+HxgbSdvYt2ujhCXWWnOUFAmEJUAMcHG1hcmNhbmRy
 ZS5sdXJlYXVAcmVkaGF0LmNvbQAKCRDa6OEJdZac5TI3D/0TwPcmvCQ6CuOUvqC0
 LjO/hfORv6HT2t1FKPstmIY00kbtdto0OVmZlxbVLkCa9/TFm8JdzLcUe6nDl8kj
 p1ZHu4QOpQX8q29D+HPof11LuOzG26LZFWWLzyYnCvqRA/IuC49afoQmTF+vRmFP
 CvU5auW5Sx76PadM2K/2LUQ0yo17jX0tuNUx+MTdU/y0bMvoOikvFnUKw8F7nlSr
 9Rq3ec7gaL29TEc1X/JhS6S2atOctJkEUHy+VyDyOQvl+Dgm0NSoXhA24k9SaIx5
 4DM0dcrf71cUELG91sFLAb6U4SJwcsr8Gkg7NrRa4hkg/8kel2NvF+57rTGyEHyS
 RFc+Xw58lNLxFZQ9VTpUgg2P+0wbUVy5u4/2mhwKs3cvxFRJSZlPUyApLye5HQMp
 sFG+cSgWZI5/bHnibi95q5LNZT0ISg6vpiI36YF0Pp6D0qdMVoirpqUdZri5nJGh
 Fw2XV14gdg0P6O6qd1PjqAkDvp3gPz0KwA4jwNzn7rlu46TJCrU0Dcl9Yl20xk1Z
 Z8dhIg66JtdyI9yGmkKixKmb0CaK+JCKkw5dMqw9QVjKKFGcnWECQkP1+azjehPE
 XRoymG+WjZ+kSMBz7tO2FbD7p7wW+S/JqKW5hs/Cfj1uZR8Jsl9rXn3F3WyZ7yUk
 wXD6II3nlQPomgzq07zKhrbk8g==
 =6lw9
 -----END PGP SIGNATURE-----

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:
Peter Maydell 2021-08-03 17:50:29 +01:00
parent acf8200722 43f547b73d
commit 2cd9e2bd09
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -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])

2
slirp

@ -1 +1 @@
Subproject commit 8f43a99191afb47ca3f3c6972f6306209f367ece
Subproject commit a88d9ace234a24ce1c17189642ef9104799425e0