@@ -74,6 +74,7 @@ env:
- CONF="--enable-schedule-iquery"
- CONF="--enable-schedule-scalable"
- CONF="--enable-dpdk-zero-copy"
+ - DPDK_SHARED="y"
- CROSS_ARCH="arm64"
- CROSS_ARCH="armhf" CFLAGS="-march=armv7-a"
- CROSS_ARCH="powerpc"
@@ -194,7 +195,14 @@ install:
esac
- |
if [ -n "$TARGET" ] ; then
- if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then
+ # force DPDK rebuild if it does not match shared/non-shared requirement
+ if [ -n "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ] ; then
+ rm -rf dpdk/"$TARGET"
+ fi
+ if [ -z "$DPDK_SHARED" -a ! -f "dpdk/${TARGET}/lib/libdpdk.a" ] ; then
+ rm -rf dpdk/"$TARGET"
+ fi
+ if [ ! -f "dpdk/${TARGET}/lib/libdpdk.a" -a ! -f "dpdk/${TARGET}/lib/libdpdk.so" ]; 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
@@ -210,6 +218,11 @@ install:
if test -n "${DPDK_MACHINE}" ; then
sed -ri 's,(CONFIG_RTE_MACHINE=).*,\1"'${DPDK_MACHINE}'",' .config
fi
+ if test -n "${DPDK_SHARED}" ; then
+ sed -ri 's,(CONFIG_RTE_BUILD_SHARED_LIB=).*,\1y,' .config
+ export LD_LIBRARY_PATH="`pwd`/${TARGET}:$LD_LIBRARY_PATH"
+ echo $LD_LIBRARY_PATH
+ fi
if test -n "$CROSS_ARCH" ; then
sed -ri -e 's,(CONFIG_RTE_EAL_IGB_UIO=).*,\1n,' .config
sed -ri -e 's,(CONFIG_RTE_KNI_KMOD=).*,\1n,' .config
@@ -254,11 +267,17 @@ script:
- pushd $HOME
- echo "Dynamic link.."
- ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_dynamic `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux`
- - echo "Static link.."
- - ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static
- if [ -z "$CROSS_ARCH" ] ; then
- LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ;
- ./odp_hello_inst_static ;
+ LD_LIBRARY_PATH="${HOME}/odp-install/lib:$LD_LIBRARY_PATH" ./odp_hello_inst_dynamic ;
+ fi
+ - echo "Static link.."
+ - |
+ # it is not possible to do static linking if we only have shared DPDK library. Compiler complains about missing -ldpdk
+ if [ -z "$TARGET" -o -z "$DPDK_SHARED" ] ; then
+ ${CC} ${CFLAGS} ${OLDPWD}/example/hello/odp_hello.c -o odp_hello_inst_static `PKG_CONFIG_PATH=${HOME}/odp-install/lib/pkgconfig:${PKG_CONFIG_PATH} pkg-config --cflags --libs libodp-linux --static` -static || exit 1
+ if [ -z "$CROSS_ARCH" ] ; then
+ ./odp_hello_inst_static || exit 1;
+ fi
fi
- popd
- ccache -s