From patchwork Wed Sep 16 14:02:28 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ciara Loftus X-Patchwork-Id: 518427 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from archives.nicira.com (li376-54.members.linode.com [96.126.127.54]) by ozlabs.org (Postfix) with ESMTP id 2DF9014017E for ; Thu, 17 Sep 2015 00:02:43 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id 57BEF10AEB; Wed, 16 Sep 2015 07:02:42 -0700 (PDT) X-Original-To: dev@openvswitch.org Delivered-To: dev@openvswitch.org Received: from mx1e4.cudamail.com (mx1.cudamail.com [69.90.118.67]) by archives.nicira.com (Postfix) with ESMTPS id 4D85A10AE8 for ; Wed, 16 Sep 2015 07:02:41 -0700 (PDT) Received: from bar5.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id B098D1E02ED for ; Wed, 16 Sep 2015 08:02:40 -0600 (MDT) X-ASG-Debug-ID: 1442412160-09eadd48f9212be0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar5.cudamail.com with ESMTP id ncLIj48GdjG6i7aM (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 16 Sep 2015 08:02:40 -0600 (MDT) X-Barracuda-Envelope-From: cloftus@ecsmtp.ir.intel.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO mga01.intel.com) (192.55.52.88) by mx1-pf1.cudamail.com with SMTP; 16 Sep 2015 14:02:39 -0000 Received-SPF: none (mx1-pf1.cudamail.com: domain at ecsmtp.ir.intel.com does not designate permitted sender hosts) X-Barracuda-Apparent-Source-IP: 192.55.52.88 X-Barracuda-RBL-IP: 192.55.52.88 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP; 16 Sep 2015 07:02:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,539,1437462000"; d="scan'208";a="562829037" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by FMSMGA003.fm.intel.com with ESMTP; 16 Sep 2015 07:02:29 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id t8GE2SKZ006563 for ; Wed, 16 Sep 2015 15:02:29 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id t8GE2Ssj008175 for ; Wed, 16 Sep 2015 15:02:28 +0100 Received: (from cloftus@localhost) by sivswdev01.ir.intel.com with id t8GE2S8W008171 for dev@openvswitch.org; Wed, 16 Sep 2015 15:02:28 +0100 X-CudaMail-Envelope-Sender: cloftus@ecsmtp.ir.intel.com From: Ciara Loftus To: dev@openvswitch.org X-CudaMail-MID: CM-E1-915025199 X-CudaMail-DTE: 091615 X-CudaMail-Originating-IP: 192.55.52.88 Date: Wed, 16 Sep 2015 15:02:28 +0100 X-ASG-Orig-Subj: [##CM-E1-915025199##][PATCH] bugfix: Fix DPDK linking when using a relative path Message-Id: <1442412148-8139-1-git-send-email-ciara.loftus@intel.com> X-Mailer: git-send-email 1.7.4.1 X-GBUdb-Analysis: 0, 192.55.52.88, Ugly c=0.247104 p=-0.0909091 Source Normal X-MessageSniffer-Rules: 0-0-0-3463-c X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1442412160 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [PATCH] bugfix: Fix DPDK linking when using a relative path X-BeenThere: dev@openvswitch.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dev-bounces@openvswitch.org Sender: "dev" When linking with DPDK, if a relative path is used with the '--with-dpdk' flag, then OVS will always be compiled with vHost Cuse support, even if it is not enabled in the DPDK build. This patch fixes this problem, and enables the correct version of vHost despite whether or not a relative or absolute path is used. Signed-off-by: Ciara Loftus --- acinclude.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/acinclude.m4 b/acinclude.m4 index b755dc4..47d9318 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -174,9 +174,10 @@ AC_DEFUN([OVS_CHECK_DPDK], [ DPDK_LIB_DIR=$RTE_SDK/lib DPDK_LIB="-ldpdk" DPDK_EXTRA_LIB="" + RTE_SDK_FULL=`readlink -f $RTE_SDK` AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include <$RTE_SDK/include/rte_config.h> + [AC_LANG_PROGRAM([#include <$RTE_SDK_FULL/include/rte_config.h> #if !RTE_LIBRTE_VHOST_USER #error #endif], [])],