diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-03-14 07:43:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-03-14 07:43:39 +0000 |
| commit | abb7ede1fb60abbaf0b5dbd0e6e1d29e291d5767 (patch) | |
| tree | f2965d81058dc86ad271f1549cad7294c7dfc75d | |
| parent | 1fa87eb56ea0af5a8133b9e11101732f5df7d46f (diff) | |
| parent | 1f773d9dd3187281b29ceae38541fa2d945b1d0f (diff) | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
Slirp updates
Daniel P. Berrangé (1):
configure: remove slirp submodule support that doesn't exist yet
Marc-André Lureau (1):
slirp: remove empty state.h
# gpg: Signature made Wed 13 Mar 2019 21:18:35 GMT
# gpg: using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg: aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: E61D BB15 D417 2BDE C97E 92D9 DB55 0E89 F0FA 54F3
* remotes/thibault/tags/samuel-thibault:
configure: remove slirp submodule support that doesn't exist yet
slirp: remove empty state.h
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rwxr-xr-x | configure | 11 | ||||
| -rw-r--r-- | slirp/src/state.c | 1 | ||||
| -rw-r--r-- | slirp/src/state.h | 0 |
3 files changed, 2 insertions, 10 deletions
@@ -1111,8 +1111,6 @@ for opt do ;; --disable-slirp) slirp="no" ;; - --enable-slirp=git) slirp="git" - ;; --enable-slirp=system) slirp="system" ;; --disable-vde) vde="no" @@ -5866,8 +5864,6 @@ case "$slirp" in "" | yes) if $pkg_config slirp; then slirp=system - elif test -e "${source_path}/.git" && test $git_update = 'yes' ; then - slirp=git elif test -e "${source_path}/slirp/Makefile" ; then slirp=internal elif test -z "$slirp" ; then @@ -5885,10 +5881,7 @@ case "$slirp" in esac case "$slirp" in - git | internal) - if test "$slirp" = git; then - git_submodules="${git_submodules} slirp" - fi + internal) mkdir -p slirp slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src" slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp" @@ -6551,7 +6544,7 @@ if test "$slirp" != "no"; then echo "SLIRP_CFLAGS=$slirp_cflags" >> $config_host_mak echo "SLIRP_LIBS=$slirp_libs" >> $config_host_mak fi -if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then +if [ "$slirp" = "internal" ]; then echo "config-host.h: subdir-slirp" >> $config_host_mak fi if test "$vde" = "yes" ; then diff --git a/slirp/src/state.c b/slirp/src/state.c index f5dd80cdc8..c3e3f0b671 100644 --- a/slirp/src/state.c +++ b/slirp/src/state.c @@ -23,7 +23,6 @@ */ #include "slirp.h" #include "vmstate.h" -#include "state.h" #include "stream.h" static int slirp_tcp_post_load(void *opaque, int version) diff --git a/slirp/src/state.h b/slirp/src/state.h deleted file mode 100644 index e69de29bb2..0000000000 --- a/slirp/src/state.h +++ /dev/null |