From patchwork Thu Mar 10 13:16:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Panu Matilainen X-Patchwork-Id: 11392 X-Patchwork-Delegate: thomas@monjalon.net 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 A5312376D; Thu, 10 Mar 2016 14:16:23 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E9B1D32A5 for ; Thu, 10 Mar 2016 14:16:18 +0100 (CET) Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 6DC1CC00EB2F; Thu, 10 Mar 2016 13:16:18 +0000 (UTC) Received: from sopuli.koti.laiskiainen.org.com (vpn1-4-209.ams2.redhat.com [10.36.4.209]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u2ADGEDs011158; Thu, 10 Mar 2016 08:16:17 -0500 From: Panu Matilainen To: dev@dpdk.org Date: Thu, 10 Mar 2016 15:16:00 +0200 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Subject: [dpdk-dev] [PATCH v3 2/3] mk: add DT_NEEDED entries for librte_vhost external dependencies 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" Add DT_NEEDED entries for external library dependencies which are the most critical ones for sane operation. Clean up vhost_cuse CFLAGS/LDFLAGS confusion while at it. Signed-off-by: Panu Matilainen --- lib/librte_vhost/Makefile | 7 ++++--- mk/rte.app.mk | 14 ++++++-------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/librte_vhost/Makefile b/lib/librte_vhost/Makefile index ef9bbae..e33ff53 100644 --- a/lib/librte_vhost/Makefile +++ b/lib/librte_vhost/Makefile @@ -41,13 +41,14 @@ LIBABIVER := 2 CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -D_FILE_OFFSET_BITS=64 ifeq ($(CONFIG_RTE_LIBRTE_VHOST_USER),y) CFLAGS += -I vhost_user +LDLIBS += -lpthread else -CFLAGS += -I vhost_cuse -lfuse -LDFLAGS += -lfuse +CFLAGS += -I vhost_cuse +LDLIBS += -lfuse endif ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -LDFLAGS += -lnuma +LDLIBS += -lnuma endif # all source are stored in SRCS-y diff --git a/mk/rte.app.mk b/mk/rte.app.mk index cadc7ab..e1cdddf 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -80,14 +80,6 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_METER) += -lrte_meter _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched _LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lrte_vhost -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma -endif - -ifeq ($(CONFIG_RTE_LIBRTE_VHOST_USER),n) -_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lfuse -endif - # The static libraries do not know their dependencies. # So linking with static library requires explicit dependencies. ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) @@ -102,6 +94,12 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_MPIPE_PMD) += -lgxio _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lcrypto _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrt +ifeq ($(CONFIG_RTE_LIBRTE_VHOST_NUMA),y) +_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lnuma +endif +ifeq ($(CONFIG_RTE_LIBRTE_VHOST_USER),n) +_LDLIBS-$(CONFIG_RTE_LIBRTE_VHOST) += -lfuse +endif endif # !CONFIG_RTE_BUILD_SHARED_LIBS _LDLIBS-y += --start-group