diff options
| author | Zoltan Kiss <zoltan.kiss@linaro.org> | 2016-07-26 13:58:00 +0100 |
|---|---|---|
| committer | Zoltan Kiss <zoltan.kiss@linaro.org> | 2016-07-26 13:58:00 +0100 |
| commit | 0968be36721ae922e61da1684dd141ba4890ea04 (patch) | |
| tree | 9d5786f9955cfec671d4c46d47a6d4ff52834bd9 | |
| parent | c364143945eb10ba7065f46a670626342f6cf0c4 (diff) | |
linux-dpdk: don't build static library with shared DPDK
It wouldn't have any practical use, and it cause a lot of linking issues.
Also make shared build the default in devbuild, it will also test whether
this thing works. As shared build is more fragile, it's a good canary for
linking issues.
Signed-off-by: Zoltan Kiss <zoltan.kiss@linaro.org>
| -rw-r--r-- | platform/linux-dpdk/m4/configure.m4 | 1 | ||||
| -rwxr-xr-x | scripts/devbuild.sh | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/platform/linux-dpdk/m4/configure.m4 b/platform/linux-dpdk/m4/configure.m4 index bc50ca585..1bc0ab452 100644 --- a/platform/linux-dpdk/m4/configure.m4 +++ b/platform/linux-dpdk/m4/configure.m4 @@ -61,6 +61,7 @@ LDFLAGS="$AM_LDFLAGS $LDFLAGS" CPPFLAGS="$AM_CPPFLAGS $CPPFLAGS" if test "x$shared_dpdk" = "xtrue"; then + enable_static=no AC_CHECK_LIB([dpdk],[rte_eal_init], [], [AC_MSG_ERROR([DPDK libraries required])]) fi diff --git a/scripts/devbuild.sh b/scripts/devbuild.sh index e8d8b00d0..b8c8bd20f 100755 --- a/scripts/devbuild.sh +++ b/scripts/devbuild.sh @@ -9,7 +9,8 @@ export GENERIC_BUILDDIR=${GENERIC_BUILDDIR:-$REPOS/odp-dpdk} # These are passed to ODP configure export CONFIGURE_FLAGS="${CONFIGURE_FLAGS:- --enable-debug \ --enable-debug-print --enable-cunit-support --enable-test-vald \ ---enable-shared=yes --enable-static=yes --enable-user-guides}" +--enable-shared=yes --enable-static=yes --enable-user-guides \ +--enable-shared-dpdk}" # where to mount huge pages export HUGEPAGEDIR=${HUGEPAGEDIR:-/mnt/huge} # don't build CUnit for us |