From: Damjan Marion <damarion@cisco.com>
Date: Tue, 21 Jun 2016 00:56:46 +0000 (-0400)
Subject: Fix problem with DPDK vector PMDs not working in VPP
X-Git-Tag: v16.09-rc1~260
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F73%2F1673%2F1;p=vpp.git

Fix problem with DPDK vector PMDs not working in VPP

Linker was picking wrong, weakly linked function from
dpdk drivers, so detection of vector mode was always failing.

Change-Id: I11725c8ddbc4604dd04ecb89ebb7f02ee05e52c7
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/vpp/Makefile.am b/vpp/Makefile.am
index 640c844b621..4c28fb795db 100644
--- a/vpp/Makefile.am
+++ b/vpp/Makefile.am
@@ -71,11 +71,13 @@ vpp_LDADD += -lsvm -lsvmdb -lrt
 vpp_LDADD += -lvnetplugin
 
 if WITH_DPDK
+vpp_LDFLAGS = -Wl,--whole-archive
 if ENABLE_DPDK_SHARED
-vpp_LDADD += -ldpdk
+vpp_LDFLAGS += -ldpdk
 else
-vpp_LDADD += -l:libdpdk.a
+vpp_LDFLAGS += -l:libdpdk.a
 endif
+vpp_LDFLAGS += -Wl,--no-whole-archive
 endif
 
 vpp_LDADD += -lvppinfra -lm -lpthread -ldl