From patchwork Wed Sep 9 16:44:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniele Di Proietto X-Patchwork-Id: 515940 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 BCF91140291 for ; Thu, 10 Sep 2015 02:44:58 +1000 (AEST) Received: from archives.nicira.com (localhost [127.0.0.1]) by archives.nicira.com (Postfix) with ESMTP id F0E7F10A3F; Wed, 9 Sep 2015 09:44:57 -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 AB6A410A3E for ; Wed, 9 Sep 2015 09:44:57 -0700 (PDT) Received: from bar2.cudamail.com (unknown [192.168.21.12]) by mx1e4.cudamail.com (Postfix) with ESMTPS id 25D7B1E04C5 for ; Wed, 9 Sep 2015 10:44:57 -0600 (MDT) X-ASG-Debug-ID: 1441817096-03dc531aa216afa0001-byXFYA Received: from mx1-pf1.cudamail.com ([192.168.24.1]) by bar2.cudamail.com with ESMTP id cFzHcHUkDqHHPlmo (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 09 Sep 2015 10:44:56 -0600 (MDT) X-Barracuda-Envelope-From: diproiettod@vmware.com X-Barracuda-RBL-Trusted-Forwarder: 192.168.24.1 Received: from unknown (HELO smtp-outbound-2.vmware.com) (208.91.2.13) by mx1-pf1.cudamail.com with ESMTPS (DHE-RSA-AES256-SHA encrypted); 9 Sep 2015 16:44:56 -0000 Received-SPF: pass (mx1-pf1.cudamail.com: SPF record at _spf.vmware.com designates 208.91.2.13 as permitted sender) X-Barracuda-Apparent-Source-IP: 208.91.2.13 X-Barracuda-RBL-IP: 208.91.2.13 Received: from sc9-mailhost1.vmware.com (sc9-mailhost1.vmware.com [10.113.161.71]) by smtp-outbound-2.vmware.com (Postfix) with ESMTP id 9B48B28283 for ; Wed, 9 Sep 2015 09:45:00 -0700 (PDT) Received: from diproiettod-dev.eng.vmware.com (unknown [10.20.208.183]) by sc9-mailhost1.vmware.com (Postfix) with ESMTP id 92E8C185D5; Wed, 9 Sep 2015 09:44:54 -0700 (PDT) X-CudaMail-Envelope-Sender: diproiettod@vmware.com From: Daniele Di Proietto To: dev@openvswitch.org X-CudaMail-Whitelist-To: dev@openvswitch.org X-CudaMail-MID: CM-E1-908052337 X-CudaMail-DTE: 090915 X-CudaMail-Originating-IP: 208.91.2.13 Date: Wed, 9 Sep 2015 17:44:04 +0100 X-ASG-Orig-Subj: [##CM-E1-908052337##][PATCH] travis: Fix build with --enable-shared and DPDK 2.1. Message-Id: <1441817044-20734-1-git-send-email-diproiettod@vmware.com> X-Mailer: git-send-email 2.1.4 X-Barracuda-Connect: UNKNOWN[192.168.24.1] X-Barracuda-Start-Time: 1441817096 X-Barracuda-Encrypted: DHE-RSA-AES256-SHA X-Barracuda-URL: https://web.cudamail.com:443/cgi-mod/mark.cgi X-ASG-Whitelist: Header =?UTF-8?B?eFwtY3VkYW1haWxcLXdoaXRlbGlzdFwtdG8=?= X-Virus-Scanned: by bsmtpd at cudamail.com X-Barracuda-BRTS-Status: 1 X-ASG-Whitelist: EmailCat (corporate) Subject: [ovs-dev] [PATCH] travis: Fix build with --enable-shared and DPDK 2.1. 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 building OVS with --enable-shared, -fPIC should be used in DPDK CFLAGS. We used to add a custom option for this (CONFIG_RTE_BUILD_FPIC) to the DPDK configuration, right after CONFIG_RTE_LIBNAME. Since CONFIG_RTE_LIBNAME has been removed, it seems simpler to add our custom option at the end of the file. Furthermore, since vhost support is enabled by default in DPDK 2.1 and vhost-user is OVS primary target, there's no need to customize the vhost related option anymore. Signed-off-by: Daniele Di Proietto Acked-by: Ben Pfaff --- .travis/build.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.travis/build.sh b/.travis/build.sh index 3cadbf0..1b7aaac 100755 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -50,9 +50,7 @@ function install_dpdk() fi find ./ -type f | xargs sed -i 's/max-inline-insns-single=100/max-inline-insns-single=400/' sed -ri 's,(CONFIG_RTE_BUILD_COMBINE_LIBS=).*,\1y,' config/common_linuxapp - sed -ri 's,(CONFIG_RTE_LIBRTE_VHOST=).*,\1y,' config/common_linuxapp - sed -ri 's,(CONFIG_RTE_LIBRTE_VHOST_USER=).*,\1n,' config/common_linuxapp - sed -ri '/CONFIG_RTE_LIBNAME/a CONFIG_RTE_BUILD_FPIC=y' config/common_linuxapp + echo 'CONFIG_RTE_BUILD_FPIC=y' >>config/common_linuxapp sed -ri '/EXECENV_CFLAGS = -pthread -fPIC/{s/$/\nelse ifeq ($(CONFIG_RTE_BUILD_FPIC),y)/;s/$/\nEXECENV_CFLAGS = -pthread -fPIC/}' mk/exec-env/linuxapp/rte.vars.mk make config CC=gcc T=x86_64-native-linuxapp-gcc make CC=gcc RTE_KERNELDIR=$KERNELSRC