This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "".
The branch, master has been updated via 82499a9a4c80670de20825992478ccd4d764e28c (commit) from c164ad605422f90f3566e4c4ebed0ea3c2adb3a8 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 82499a9a4c80670de20825992478ccd4d764e28c Author: Dmitry Eremin-Solenikov dmitry.ereminsolenikov@linaro.org Date: Sun Apr 22 23:49:15 2018 +0300
linux-gen: dpdk: fix linking to libnuma
Linking to dpdk/numa can fail with the following message: /usr/bin/x86_64-linux-gnu-ld: lib/.libs/libodp-linux.a(dpdk.o): undefined reference to symbol 'numa_num_configured_nodes@@libnuma_1.2' //usr/lib/x86_64-linux-gnu/libnuma.so.1: error adding symbols: DSO missing from command line
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
diff --git a/platform/linux-generic/m4/odp_dpdk.m4 b/platform/linux-generic/m4/odp_dpdk.m4 index cb2ed60d..09dde35a 100644 --- a/platform/linux-generic/m4/odp_dpdk.m4 +++ b/platform/linux-generic/m4/odp_dpdk.m4 @@ -40,6 +40,14 @@ then ;; esac
+ OLD_LIBS=$LIBS + LIBS="-lnuma" + AC_TRY_LINK_FUNC([numa_num_configured_nodes], + [AC_DEFINE([HAVE_NUMA_LIBRARY], [1], + [Define to 1 if numa library is usable]) + AS_VAR_APPEND([DPDK_LIBS_LIBODP], [" -lnuma"])]) + LIBS=$OLD_LIBS + AC_DEFINE([ODP_PKTIO_DPDK], [1], [Define to 1 to enable DPDK packet I/O support]) AC_DEFINE_UNQUOTED([ODP_DPDK_ZERO_COPY], [$zero_copy], diff --git a/platform/linux-generic/pktio/dpdk.c b/platform/linux-generic/pktio/dpdk.c index 0550416b..14d59d8e 100644 --- a/platform/linux-generic/pktio/dpdk.c +++ b/platform/linux-generic/pktio/dpdk.c @@ -50,7 +50,7 @@ #include <rte_version.h>
/* NUMA is not supported on all platforms */ -#ifdef RTE_EAL_NUMA_AWARE_HUGEPAGES +#ifdef HAVE_NUMA_LIBRARY #include <numa.h> #else #define numa_num_configured_nodes() 1
-----------------------------------------------------------------------
Summary of changes: platform/linux-generic/m4/odp_dpdk.m4 | 8 ++++++++ platform/linux-generic/pktio/dpdk.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)
hooks/post-receive