[dpdk-dev] mk: Make XEN_PMD build in combined library mode - v2
Commit Message
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.
Updates in Version 2:
Move it out of the --start-group as well
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
[diffstat]
rte.app.mk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[diff]
Comments
2015-12-03 08:04, Christian Ehrhardt:
> 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.
>
> Updates in Version 2:
> Move it out of the --start-group as well
>
> Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Reported-by: Thiago Martins <thiagocmartinsc@gmail.com>
Applied, thanks
@@ -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)