diff options
| author | Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org> | 2018-01-19 00:58:30 +0300 |
|---|---|---|
| committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-01-22 21:59:50 +0300 |
| commit | f4e4b30454d6d961d0401717a11c6da06a889a7b (patch) | |
| tree | ff7650cd187844f3745d4e64a1fad60e88b17ade /.travis.yml | |
| parent | beb496bad99c91f639ea0aefaed7d4d30ec1368c (diff) | |
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 <dmitry.ereminsolenikov@linaro.org>
Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 6 |
1 files 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 |