fix dpdk_plugin.so load failure with DPDK 18.08

load_one_plugin:189: Loaded plugin: abf_plugin.so (ACL based Forwarding)
load_one_plugin:189: Loaded plugin: acl_plugin.so (Access Control Lists)
load_one_plugin:189: Loaded plugin: avf_plugin.so (Intel Adaptive Virtual Function (AVF) Device Plugin)
load_one_plugin:191: Loaded plugin: cdp_plugin.so
load_one_plugin:145: /home/lijian/tasks/_ipsum/vpp/build-root/install-vpp-native/vpp/lib64/vpp_plugins/dpdk_plugin.so: undefined symbol: mnl_socket_close
load_one_plugin:146: Failed to load plugin 'dpdk_plugin.so'
load_one_plugin:189: Loaded plugin: flowprobe_plugin.so (Flow per Packet)
load_one_plugin:189: Loaded plugin: gbp_plugin.so (Group Based Policy)

Change-Id: I4f885f2bd3e548dbb2f7afec3363ed8ae09b3eca
Signed-off-by: Lijian Zhang <Lijian.Zhang@arm.com>

diff --git a/src/configure.ac b/src/configure.ac
index 7733daa..f35e139 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -198,6 +198,7 @@ DISABLE_ARG(svm,    [Disable svm and dependant libs and binaries])
 DISABLE_ARG(papi,      [Disable Python API bindings])
 
 # --with-X
+WITH_ARG(dpdk_mlx5_pmd, [Enable Mellanox DPDK PMD driver])
 
 # --without-X
 WITHOUT_ARG(libssl,    [Disable libssl])

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 6c15d0a..0165566 100644 (file)
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -30,7 +30,11 @@ if WITH_LIBNUMA
 dpdk_plugin_la_LDFLAGS += -Wl,-lnuma
 endif
 
+if WITH_DPDK_MLX5_PMD
+dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl,-lmnl
+else
 dpdk_plugin_la_LDFLAGS += -Wl,-lm,-ldl
+endif
 dpdk_plugin_la_LIBADD =
 
 dpdk_plugin_la_SOURCES =                                       \