From patchwork Sun May 11 13:07:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 347784 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 2518B1400B5 for ; Sun, 11 May 2014 23:07:31 +1000 (EST) Received: from localhost ([::1]:32836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjTTU-00086Q-QM for incoming@patchwork.ozlabs.org; Sun, 11 May 2014 09:07:28 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37560) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjTTB-0007pu-1X for qemu-devel@nongnu.org; Sun, 11 May 2014 09:07:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WjTT6-0004Wb-1X for qemu-devel@nongnu.org; Sun, 11 May 2014 09:07:08 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:33476) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WjTT5-0004WP-R4 for qemu-devel@nongnu.org; Sun, 11 May 2014 09:07:03 -0400 Received: from tsrv.corpit.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 5DC2E40DC0; Sun, 11 May 2014 17:07:01 +0400 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.corpit.ru (Postfix) with SMTP id 3FEC0661; Sun, 11 May 2014 17:07:01 +0400 (MSK) Received: (nullmailer pid 26704 invoked by uid 1000); Sun, 11 May 2014 13:07:01 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Sun, 11 May 2014 17:07:00 +0400 Message-Id: <1399813620-26668-1-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.10.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 86.62.121.231 Cc: Fam Zheng , Michael Tokarev , Peter Lieven Subject: [Qemu-devel] [PATCH] block/nfs: use per-object vars and make it modular X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org nfs block module uses libnfs and uses pkg-config to determine its build information. Somehow it used only --libs, not --cflags, and added those libs into global $LIBS, instead of using per-object variable. Use both --libs and --cflags, use them as per-object variable, and finally make block/nfs.o to be modular. Signed-off-by: Michael Tokarev --- block/Makefile.objs | 2 ++ configure | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/block/Makefile.objs b/block/Makefile.objs index fd88c03..38ddc0e 100644 --- a/block/Makefile.objs +++ b/block/Makefile.objs @@ -35,5 +35,7 @@ gluster.o-cflags := $(GLUSTERFS_CFLAGS) gluster.o-libs := $(GLUSTERFS_LIBS) ssh.o-cflags := $(LIBSSH2_CFLAGS) ssh.o-libs := $(LIBSSH2_LIBS) +nfs.o-cflags := $(LIBNFS_CFLAGS) +nfs.o-libs := $(LIBNFS_LIBS) qcow.o-libs := -lz linux-aio.o-libs := -laio diff --git a/configure b/configure index ac2fa15..3bc91f6 100755 --- a/configure +++ b/configure @@ -3928,7 +3928,7 @@ if test "$libnfs" != "no" ; then if $pkg_config --atleast-version=1.9.3 libnfs; then libnfs="yes" libnfs_libs=$($pkg_config --libs libnfs) - LIBS="$LIBS $libnfs_libs" + libnfs_cflags=$($pkg_config --cflags libnfs) else if test "$libnfs" = "yes" ; then feature_not_found "libnfs" @@ -4534,7 +4534,9 @@ if test "$libiscsi" = "yes" ; then fi if test "$libnfs" = "yes" ; then - echo "CONFIG_LIBNFS=y" >> $config_host_mak + echo "CONFIG_LIBNFS=m" >> $config_host_mak + echo "LIBNFS_CFLAGS=$libnfs_cflags" >> $config_host_mak + echo "LIBNFS_LIBS=$libnfs_libs" >> $config_host_mak fi if test "$seccomp" = "yes"; then