diff mbox series

[PULL,38/38] buildsys: Move rdma libs to per object

Message ID	20170908095506.13594-39-famz@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com BBA32C057FAD From: Fam Zheng <famz@redhat.com> To: qemu-devel@nongnu.org Date: Fri, 8 Sep 2017 17:55:06 +0800 Message-Id: <20170908095506.13594-39-famz@redhat.com> In-Reply-To: <20170908095506.13594-1-famz@redhat.com> References: <20170908095506.13594-1-famz@redhat.com> Subject: [Qemu-devel] [PULL 38/38] buildsys: Move rdma libs to per object Precedence: list Cc: Peter Maydell <peter.maydell@linaro.org> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	[PULL,01/38] docker: ensure NOUSER for travis images \| expand [PULL,01/38] docker: ensure NOUSER for travis images [PULL,02/38] docker: docker.py make --no-cache skip checksum test [PULL,03/38] docker: don't install device-tree-compiler build-deps in travis.docker [PULL,04/38] docker: reduce noise when building travis.docker [PULL,05/38] docker: Update ubuntu image [PULL,06/38] docker: Enable features explicitly in test-full [PULL,07/38] tests/docker: Clean up paths [PULL,08/38] gitignore: Ignore vm test images [PULL,09/38] qemu.py: Add "wait()" method [PULL,10/38] scripts: Add archive-source.sh [PULL,11/38] tests: Add vm test lib [PULL,12/38] tests: Add ubuntu.i386 image [PULL,13/38] tests: Add FreeBSD image [PULL,14/38] tests: Add NetBSD image [PULL,15/38] tests: Add OpenBSD image [PULL,16/38] Makefile: Add rules to run vm tests [PULL,17/38] MAINTAINERS: Add tests/vm entry [PULL,18/38] tests: Add README for vm tests [PULL,19/38] docker: Use archive-source.py [PULL,20/38] docker: Fix return code of build_qemu() [PULL,21/38] docker: Add test_fail and prep_fail [PULL,22/38] docker: Use unconfined security profile [PULL,23/38] docker: Add nettle-devel to fedora image [PULL,24/38] docker: Add test-block [PULL,25/38] docker: Drop 'set -e' from run script [PULL,26/38] vl: Don't include vde header [PULL,27/38] buildsys: Move vde libs to per object [PULL,28/38] buildsys: Move gtk/vte cflags/libs to per object [PULL,29/38] buildsys: Move sdl cflags/libs to per object [PULL,30/38] buildsys: Move vnc cflags/libs to per object [PULL,31/38] buildsys: Move audio libs to per object [PULL,32/38] buildsys: Move curese cflags/libs to per object [PULL,33/38] buildsys: Move opengl cflags to per object [PULL,34/38] buildsys: Move libcacard cflags/libs to per object [PULL,35/38] buildsys: Move libusb cflags/libs to per object [PULL,36/38] buildsys: Move usb redir cflags/libs to per object [PULL,37/38] buildsys: Move brlapi libs to per object [PULL,38/38] buildsys: Move rdma libs to per object

Commit Message

Fam Zheng Sept. 8, 2017, 9:55 a.m. UTC

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <20170907084230.26493-1-famz@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
---
 configure               | 2 +-
 migration/Makefile.objs | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/configure b/configure
index e354497eaa..5b86653bcd 100755
--- a/configure
+++ b/configure
@@ -2812,7 +2812,6 @@  EOF
   rdma_libs="-lrdmacm -libverbs"
   if compile_prog "" "$rdma_libs" ; then
     rdma="yes"
-    libs_softmmu="$libs_softmmu $rdma_libs"
   else
     if test "$rdma" = "yes" ; then
         error_exit \
@@ -6039,6 +6038,7 @@  echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak
 
 if test "$rdma" = "yes" ; then
   echo "CONFIG_RDMA=y" >> $config_host_mak
+  echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
 fi
 
 if test "$have_rtnetlink" = "yes" ; then
diff --git a/migration/Makefile.objs b/migration/Makefile.objs
index 1c7770da46..99e038024d 100644
--- a/migration/Makefile.objs
+++ b/migration/Makefile.objs
@@ -11,3 +11,4 @@  common-obj-$(CONFIG_RDMA) += rdma.o
 
 common-obj-$(CONFIG_LIVE_BLOCK_MIGRATION) += block.o
 
+rdma.o-libs := $(RDMA_LIBS)