From patchwork Thu Dec 3 07:04:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Ehrhardt X-Patchwork-Id: 9286 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 408A212A8; Thu, 3 Dec 2015 08:04:27 +0100 (CET) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id CF624B62 for ; Thu, 3 Dec 2015 08:04:25 +0100 (CET) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=Weiknorze.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1a4NwH-0004iB-Jo; Thu, 03 Dec 2015 07:04:25 +0000 From: Christian Ehrhardt To: dev@dpdk.org Date: Thu, 3 Dec 2015 08:04:23 +0100 Message-Id: <1449126263-18796-1-git-send-email-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH] mk: Make XEN_PMD build in combined library mode - v2 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Reported-by: Thiago Martins --- [diffstat] rte.app.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) [diff] 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)