diff options
author | Josep Puigdemont <josep.puigdemont@linaro.org> | 2018-03-09 16:58:15 +0100 |
---|---|---|
committer | Maxim Uvarov <maxim.uvarov@linaro.org> | 2018-03-13 19:26:03 +0300 |
commit | 9a1d48b1262d88e55922c4e1ed9f91ed2e3376d7 (patch) | |
tree | 6e8694a786227897cd978390a85c0489aa8d36c9 | |
parent | 1e70adc3ae54b0c4518bdb51d94301f1dafe4ebf (diff) |
odp_dpdk.m4: use correct installation directory
We are currently using the include path used when building DPDK, however
when installing DPDK, the headers are put in ${prefix}/include/dpdk.
We should use the latter in our include path.
Signed-off-by: Josep Puigdemont <josep.puigdemont@linaro.org>
Reviewed-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
-rw-r--r-- | .travis.yml | 7 | ||||
-rw-r--r-- | m4/odp_dpdk.m4 | 2 | ||||
-rwxr-xr-x | scripts/build-pktio-dpdk | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index a03b29041..1f5ef42e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -195,7 +195,7 @@ install: LIBDPDKEXT=a fi DPDK_TARGET="${DPDK_TARGET}gcc" - if [ ! -f "dpdk/${TARGET}/lib/libdpdk.$LIBDPDKEXT" ]; then + if [ ! -f "dpdk/${TARGET}/usr/local/lib/libdpdk.$LIBDPDKEXT" ]; 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 @@ -222,10 +222,11 @@ install: echo CONFIG_RTE_TOOLCHAIN_${DPDKCC^^}=y >> .config popd make build O=${TARGET} EXTRA_CFLAGS="-fPIC $DPDK_CFLAGS" CROSS="$DPDK_CROSS" CC="$CC" HOSTCC=gcc -j $(nproc) + make install O=${TARGET} DESTDIR=${TARGET} rm -r ./doc ./${TARGET}/app ./${TARGET}/build popd fi - EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}" + EXTRA_CONF="$EXTRA_CONF --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local" fi # Netmap pktio @@ -293,7 +294,7 @@ jobs: - ./bootstrap - ./configure --prefix=$HOME/odp-install --enable-user-guides - --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local --with-netmap-path=`pwd`/netmap CFLAGS="-O0 -coverage" CXXFLAGS="-O0 -coverage" LDFLAGS="--coverage" --enable-debug=full diff --git a/m4/odp_dpdk.m4 b/m4/odp_dpdk.m4 index 6e2a914b1..b94c9b557 100644 --- a/m4/odp_dpdk.m4 +++ b/m4/odp_dpdk.m4 @@ -120,7 +120,7 @@ AS_IF([test "x$1" = "xsystem"], [dnl fi DPDK_LIB_PATH=`AS_DIRNAME(["$DPDK_LIB_PATH"])` ], [dnl - DPDK_CPPFLAGS="-isystem $1/include" + DPDK_CPPFLAGS="-isystem $1/include/dpdk" DPDK_LIB_PATH="$1/lib" DPDK_LDFLAGS="-L$DPDK_LIB_PATH" if test -r "$DPDK_LIB_PATH"/libdpdk.so ; then diff --git a/scripts/build-pktio-dpdk b/scripts/build-pktio-dpdk index 97916c1e1..26afd97c9 100755 --- a/scripts/build-pktio-dpdk +++ b/scripts/build-pktio-dpdk @@ -28,12 +28,13 @@ sed -ri 's,(CONFIG_RTE_LIBRTE_PMD_PCAP=).*,\1y,' .config popd #Build DPDK -make install T=${TARGET} EXTRA_CFLAGS="-fPIC" +make build O=${TARGET} EXTRA_CFLAGS="-fPIC" +make install O=${TARGET} DESTDIR=${TARGET} popd #Build ODP ./bootstrap; ./configure --enable-test-vald --enable-test-perf --enable-test-cpp \ --enable-debug --enable-debug-print \ - --with-dpdk-path=`pwd`/dpdk/${TARGET} + --with-dpdk-path=`pwd`/dpdk/${TARGET}/usr/local make |