From: Daniele Di Proietto Date: Wed, 9 Sep 2015 16:40:40 +0000 (+0100) Subject: travis: Fix build with --enable-shared and DPDK 2.1. X-Git-Tag: v2.5.0~607 X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=5d1877e0343a6ad8bf704a4ed02d168dc0b3780b travis: Fix build with --enable-shared and DPDK 2.1. 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. Tested-at: https://travis-ci.org/ddiproietto/ovs/builds/79451461 Signed-off-by: Daniele Di Proietto Acked-by: Ben Pfaff --- diff --git a/.travis/build.sh b/.travis/build.sh index 3cadbf0ce..1b7aaac6f 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