From: Marco Varlese <marco.varlese@suse.com>
Date: Wed, 10 May 2017 15:02:58 +0000 (+0200)
Subject: Unneeded linking
X-Git-Tag: v17.07-rc1~178
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=f73dae3c45b8fd8c0d9e26d386c56a90cfaf67fd;p=vpp.git

Unneeded linking

Removed the linking which does not appear to be necessary when using in repo
dpdk and which causes a build failure when using the shared-dpdk mode.

Change-Id: I6bad2bd11d6db40fbd2def78f98c6beba66ff416
Signed-off-by: Marco Varlese <marco.varlese@suse.com>
---

diff --git a/src/plugins/dpdk.am b/src/plugins/dpdk.am
index 0b2425025dc..75bfb967af6 100644
--- a/src/plugins/dpdk.am
+++ b/src/plugins/dpdk.am
@@ -14,7 +14,11 @@
 vppapitestplugins_LTLIBRARIES += dpdk_test_plugin.la
 vppplugins_LTLIBRARIES += dpdk_plugin.la
 
+if ENABLE_DPDK_SHARED
+dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -ldpdk
+else
 dpdk_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,--whole-archive,-l:libdpdk.a,--no-whole-archive
+endif
 if WITH_DPDK_CRYPTO_SW
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libIPSec_MB.a,-l:libIPSec_MB.a
 dpdk_plugin_la_LDFLAGS += -Wl,--exclude-libs,libisal_crypto.a,-l:libisal_crypto.a