summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2015-12-03 08:04:23 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2015-12-04 20:10:35 +0100
commit539ed5f819c0a70dbd348f5437b30d957d667b3c (patch)
tree22b80d1360c2a7e190b11a73e2e76bf4ca52f00b /mk
parent9aa2053c6e81493b23346ff4e387903560de5c81 (diff)
downloaddpdk-539ed5f819c0a70dbd348f5437b30d957d667b3c.zip
dpdk-539ed5f819c0a70dbd348f5437b30d957d667b3c.tar.gz
dpdk-539ed5f819c0a70dbd348f5437b30d957d667b3c.tar.xz
mk: fix combined library build with Xen driver
Building RTE_LIBRTE_PMD_XENVIRT was broken when RTE_BUILD_COMBINE_LIBS was enabled (http://dpdk.org/ml/archives/dev/2015-November/028660.html). Now the underlying issue is rather simple, the xen code needs libxenstore. But rte.app.mk so far only considered that when RTE_BUILD_COMBINE_LIBS was disabled. While it is correct to create the DPDK sublib linking only in the RTE_BUILD_COMBINE_LIBS=n case, the libxenstore should be added to the linked libs in any case if RTE_LIBRTE_PMD_XENVIRT is enabled. Reported-by: Thiago Martins <thiagocmartinsc@gmail.com> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.app.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/mk/rte.app.mk b/mk/rte.app.mk
index 85a680d..d7e2964 100644
--- a/mk/rte.app.mk
+++ b/mk/rte.app.mk
@@ -112,6 +112,8 @@ endif # ! CONFIG_RTE_BUILD_SHARED_LIBS
_LDLIBS-$(CONFIG_RTE_LIBRTE_BNX2X_PMD) += -lz
+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lxenstore
+
_LDLIBS-y += --start-group
ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n)
@@ -130,7 +132,6 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_CFGFILE) += -lrte_cfgfile
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_BOND) += -lrte_pmd_bond
_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lrte_pmd_xenvirt
-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_XENVIRT) += -lxenstore
ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n)
# plugins (link only if static libraries)