[ovs-dev] [PATCH v2 1/2] travis: Do not patch dpdk sources.
David Marchand
david.marchand at redhat.com
Wed Jun 19 07:26:28 UTC 2019
Rather than patch the dpdk makefile and a template config file, we can
pass the -fPIC flag via EXTRA_CFLAGS.
This is more reliable than expecting the dpdk file names to be kept
unchanged.
Signed-off-by: David Marchand <david.marchand at redhat.com>
---
Changelog since v1:
- rebased on master
---
.travis/linux-build.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/.travis/linux-build.sh b/.travis/linux-build.sh
index 3d11b63..3a5c4a2 100755
--- a/.travis/linux-build.sh
+++ b/.travis/linux-build.sh
@@ -76,8 +76,6 @@ function install_dpdk()
if [ $DIR_NAME != "dpdk-$1" ]; then mv $DIR_NAME dpdk-$1; fi
cd dpdk-$1
fi
- 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=$TARGET
@@ -90,7 +88,7 @@ function install_dpdk()
sed -i '/CONFIG_RTE_EAL_IGB_UIO=y/s/=y/=n/' build/.config
sed -i '/CONFIG_RTE_KNI_KMOD=y/s/=y/=n/' build/.config
- make -j4 CC=gcc
+ make -j4 CC=gcc EXTRA_CFLAGS='-fPIC'
echo "Installed DPDK source in $(pwd)"
cd ..
}
--
1.8.3.1
More information about the dev
mailing list