From: Fam Zheng <famz@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL 27/38] buildsys: Move vde libs to per object
Date: Fri, 8 Sep 2017 17:54:55 +0800 [thread overview]
Message-ID: <20170908095506.13594-28-famz@redhat.com> (raw)
In-Reply-To: <20170908095506.13594-1-famz@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907083552.17725-3-famz@redhat.com>
Reviewed-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
configure | 3 +--
net/Makefile.objs | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index c755d733a7..821922fffc 100755
--- a/configure
+++ b/configure
@@ -2960,8 +2960,6 @@ int main(void)
EOF
if compile_prog "" "$vde_libs" ; then
vde=yes
- libs_softmmu="$vde_libs $libs_softmmu"
- libs_tools="$vde_libs $libs_tools"
else
if test "$vde" = "yes" ; then
feature_not_found "vde" "Install vde (Virtual Distributed Ethernet) devel"
@@ -5542,6 +5540,7 @@ if test "$slirp" = "yes" ; then
fi
if test "$vde" = "yes" ; then
echo "CONFIG_VDE=y" >> $config_host_mak
+ echo "VDE_LIBS=$vde_libs" >> $config_host_mak
fi
if test "$netmap" = "yes" ; then
echo "CONFIG_NETMAP=y" >> $config_host_mak
diff --git a/net/Makefile.objs b/net/Makefile.objs
index 67ba5e26fb..64adf32f40 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -21,3 +21,5 @@ tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
tap-obj-y ?= tap-stub.o
common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
common-obj-$(CONFIG_WIN32) += tap-win32.o
+
+vde.o-libs = $(VDE_LIBS)
--
2.13.5
next prev parent reply other threads:[~2017-09-08 9:56 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-08 9:54 [Qemu-devel] [PULL 00/38] Test and build system patches Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 01/38] docker: ensure NOUSER for travis images Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 02/38] docker: docker.py make --no-cache skip checksum test Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 03/38] docker: don't install device-tree-compiler build-deps in travis.docker Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 04/38] docker: reduce noise when building travis.docker Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 05/38] docker: Update ubuntu image Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 06/38] docker: Enable features explicitly in test-full Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 07/38] tests/docker: Clean up paths Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 08/38] gitignore: Ignore vm test images Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 09/38] qemu.py: Add "wait()" method Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 10/38] scripts: Add archive-source.sh Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 11/38] tests: Add vm test lib Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 12/38] tests: Add ubuntu.i386 image Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 13/38] tests: Add FreeBSD image Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 14/38] tests: Add NetBSD image Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 15/38] tests: Add OpenBSD image Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 16/38] Makefile: Add rules to run vm tests Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 17/38] MAINTAINERS: Add tests/vm entry Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 18/38] tests: Add README for vm tests Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 19/38] docker: Use archive-source.py Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 20/38] docker: Fix return code of build_qemu() Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 21/38] docker: Add test_fail and prep_fail Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 22/38] docker: Use unconfined security profile Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 23/38] docker: Add nettle-devel to fedora image Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 24/38] docker: Add test-block Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 25/38] docker: Drop 'set -e' from run script Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 26/38] vl: Don't include vde header Fam Zheng
2017-09-08 9:54 ` Fam Zheng [this message]
2017-09-08 9:54 ` [Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per object Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 29/38] buildsys: Move sdl " Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 30/38] buildsys: Move vnc " Fam Zheng
2017-09-08 9:54 ` [Qemu-devel] [PULL 31/38] buildsys: Move audio libs " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 34/38] buildsys: Move libcacard cflags/libs " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 35/38] buildsys: Move libusb " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 36/38] buildsys: Move usb redir " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 37/38] buildsys: Move brlapi libs " Fam Zheng
2017-09-08 9:55 ` [Qemu-devel] [PULL 38/38] buildsys: Move rdma " Fam Zheng
2017-09-08 10:31 ` [Qemu-devel] [PULL 00/38] Test and build system patches no-reply
2017-09-08 13:44 ` Peter Maydell
2017-09-09 0:07 ` Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170908095506.13594-28-famz@redhat.com \
--to=famz@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).