From f4e4b30454d6d961d0401717a11c6da06a889a7b Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Fri, 19 Jan 2018 00:58:30 +0300 Subject: travis: move --with-dpdk-path out of DPDK build if 1b285bbd (travis: also use DPDK when doing cross-compile tests) moved adding --with-dpdk-path to EXTRA_CONF to be executed under DPDK-building if. Move it outside of that if, so that DPDK is enabled even if it's prebuilt. Fixes: 1b285bbdd1abbec9853e1bc51bdb6ee02643b1a7 Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index bd49fb377..fca06a0d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -197,7 +197,8 @@ install: ;; esac - | - if [ -n "$TARGET" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ]; then + if [ -n "$TARGET" ] ; then + if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then git -c advice.detachedHead=false clone -q --depth=1 --single-branch --branch=v${DPDK_VERS} http://dpdk.org/git/dpdk dpdk pushd dpdk git log --oneline --decorate @@ -221,7 +222,8 @@ install: make install T=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" -j $(nproc) rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + fi + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" fi # Netmap pktio -- cgit v1.2.3