Commit 7c8cd346 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging 



slirp: move slirp as git submodule project

Marc-André Lureau (2):
  build-sys: pass CFLAGS & LDFLAGS to subdir-slirp
  build-sys: move slirp as git submodule project

# gpg: Signature made Thu 02 May 2019 23:20:52 BST
# 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:
  build-sys: move slirp as git submodule project
  build-sys: pass CFLAGS & LDFLAGS to subdir-slirp

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f62d632f 7c57bdd8

.gitmodules

+3 −0
Original line number Diff line number Diff line
@@ -52,3 +52,6 @@ 
[submodule "roms/edk2"]

	path = roms/edk2

	url = https://github.com/tianocore/edk2.git

[submodule "slirp"]

	path = slirp

	url = https://gitlab.freedesktop.org/slirp/libslirp.git

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ subdir-capstone: .git-submodule-status 
	$(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS) $(BUILD_DIR)/capstone/$(LIBCAPSTONE))



subdir-slirp: .git-submodule-status

	$(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS)")

	$(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")



$(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \

	$(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))

configure

+9 −2
Original line number Diff line number Diff line
@@ -1115,6 +1115,8 @@ for opt do 
  ;;

  --disable-slirp) slirp="no"

  ;;

  --enable-slirp=git) slirp="git"

  ;;

  --enable-slirp=system) slirp="system"

  ;;

  --disable-vde) vde="no"
@@ -5868,6 +5870,8 @@ 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,7 +5889,10 @@ case "$slirp" in 
esac



case "$slirp" in

  internal)

  git | internal)

    if test "$slirp" = git; then

      git_submodules="${git_submodules} slirp"

    fi

    mkdir -p slirp

    slirp_cflags="-I\$(SRC_PATH)/slirp/src -I\$(BUILD_DIR)/slirp/src"

    slirp_libs="-L\$(BUILD_DIR)/slirp -lslirp"
@@ -6548,7 +6555,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" = "internal" ]; then

if [ "$slirp" = "git" -o "$slirp" = "internal" ]; then

    echo "config-host.h: subdir-slirp" >> $config_host_mak

fi

if test "$vde" = "yes" ; then

scripts/archive-source.sh

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ vroot_dir="${tar_file}.vroot" 
# independent of what the developer currently has initialized

# in their checkout, because the build environment is completely

# different to the host OS.

submodules="dtc ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"

submodules="dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"



trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15

slirp @ 59a1b1f1

Original line number Diff line number Diff line 
Subproject commit 59a1b1f165458c2acb7ff0525b543945f7416225