Commit d731058395cb used vswitchd_ovs_vswitchd_LDFLAGS to link with DPDK. This
made automake ignore AM_LDFLAGS while linking the daemon.
This commit explicitly adds AM_LDFLAGS to vswitchd_ovs_vswitchd_LDFLAGS and
moves it to vswitchd/automake.mk
Reported-by: Gurucharan Shetty <gshe...@nicira.com>
Suggested-by: Ben Pfaff <b...@nicira.com>
Signed-off-by: Daniele Di Proietto <ddiproie...@vmware.com>
---
Guru, does this properly address the issue?
We could also put the extra line in vswitchd/automake.mk inside an "if
DPDK_NETDEV" block. What do you guys think?
---
acinclude.m4 | 4 ++--
vswitchd/automake.mk | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/acinclude.m4 b/acinclude.m4
index e6a6a88..7e036e5 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -208,8 +208,8 @@ AC_DEFUN([OVS_CHECK_DPDK], [
#
# These options are specified inside a single -Wl directive to prevent
# autotools from reordering them.
-
vswitchd_ovs_vswitchd_LDFLAGS=-Wl,--whole-archive,$DPDK_LIB,--no-whole-archive
- AC_SUBST([vswitchd_ovs_vswitchd_LDFLAGS])
+ DPDK_vswitchd_LDFLAGS=-Wl,--whole-archive,$DPDK_LIB,--no-whole-archive
+ AC_SUBST([DPDK_vswitchd_LDFLAGS])
AC_DEFINE([DPDK_NETDEV], [1], [System uses the DPDK module.])
else
RTE_SDK=
diff --git a/vswitchd/automake.mk b/vswitchd/automake.mk
index a09605f..2d43b9e 100644
--- a/vswitchd/automake.mk
+++ b/vswitchd/automake.mk
@@ -15,6 +15,7 @@ vswitchd_ovs_vswitchd_LDADD = \
ofproto/libofproto.la \
lib/libsflow.la \
lib/libopenvswitch.la
+vswitchd_ovs_vswitchd_LDFLAGS = $(AM_LDFLAGS) $(DPDK_vswitchd_LDFLAGS)
EXTRA_DIST += vswitchd/INTERNALS
MAN_ROOTS += vswitchd/ovs-vswitchd.8.in
--
2.1.0.rc1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
