From: Christian Ehrhardt Date: Thu, 3 Dec 2015 07:04:23 +0000 (+0100) Subject: mk: fix combined library build with Xen driver X-Git-Tag: spdx-start~7908 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=539ed5f819c0a70dbd348f5437b30d957d667b3c;p=dpdk.git 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 Signed-off-by: Christian Ehrhardt --- diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 85a680de2e..d7e2964bce 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)