From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 35341293C for ; Fri, 10 Jun 2016 00:19:12 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id n184so243666430wmn.1 for ; Thu, 09 Jun 2016 15:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ijazi9UUTatSV5wbEwEpd/0JyUNhFCCB5qwG3jx0hQI=; b=Gl7GW1nLeBfeBBT2OJ/5Qh8my9LUQRP7OdGohxUf59aRGdxh7hMU0624b9VG65t95f CP1897Vds/5zPbo2m0pjrkS/C4JPWWSOsEdhVJgvnGUZnRYD1zaQ+ZvUWE52ugy1Weha jEQxZeixwW+sStGijlhftdTBBiA6Rq/snyOGY/jKPlunWULPS+uFrRvyelZI75q+C85i i3WO8z6t0WrJ+587LDwg4fALYPDvOJQbcS1vxQj0s2S0LxBMoOJUIzSuSig7vl+weNyi dmfhaLyVKvRmH4JNFAyloZ42DUHyIjRNsC4mXc78PG5Gbv3opJ8BJYX8r+i2kvl+M8qH TLmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ijazi9UUTatSV5wbEwEpd/0JyUNhFCCB5qwG3jx0hQI=; b=Q7J9QfinpyLjqngXtIYbGIJjukP/ZKZ2wKmkLkJZHV0WZHIGM3Ix5GBI9sRMhaQZpX nO4pvZTluFyaLVsPjMNfunrPHDxHGjHMc536gNeZxNlrBK012qRm0H1iM6bsGJ+wBj1d rKyq5L4OHVBgIrKab9qM7QZARKlJH9rjP9JU/KRiKEW9dL/HOkgfSff/VekJQCwfHiP1 1qAkbkW8pkBtte0S+85zyNZujaAYiqDW2JFC7lAEuANHx8ixQSsxjAVM1fcPZsnKTKVL ARVpgEpLl5kLZrZXJnsnlmyn+5mnu7Y+LBOY6x0yZefY0ODL7zWvU3oMVmJn7t9G6B4r uKlA== X-Gm-Message-State: ALyK8tJo/wGaCPUcSqgvr+9dMQAFix7LWjzp0t4eFpRcStetQ0ZrXMlMi4QgHrTX5zZP1uMl X-Received: by 10.28.93.80 with SMTP id r77mr14705313wmb.20.1465510751830; Thu, 09 Jun 2016 15:19:11 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id n66sm9741833wmn.7.2016.06.09.15.19.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Jun 2016 15:19:11 -0700 (PDT) From: Thomas Monjalon To: david.marchand@6wind.com Cc: dev@dpdk.org Date: Fri, 10 Jun 2016 00:19:06 +0200 Message-Id: <1465510746-8274-1-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1465484403-8209-1-git-send-email-thomas.monjalon@6wind.com> References: <1465484403-8209-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v2] eal: remove useless includes of mempool and ring 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: , X-List-Received-Date: Thu, 09 Jun 2016 22:19:12 -0000 The libraries rte_mempool and rte_ring are not used in EAL, except for the ivshmem part (CONFIG_RTE_LIBRTE_IVSHMEM). Signed-off-by: Thomas Monjalon --- This patch must be applied on top of "log: deprecate history dump". v2: clean up also EAL and ivshmem Makefiles --- lib/librte_eal/bsdapp/eal/Makefile | 1 - lib/librte_eal/linuxapp/eal/Makefile | 3 +++ lib/librte_eal/linuxapp/eal/eal_interrupts.c | 2 -- lib/librte_eal/linuxapp/eal/eal_ivshmem.c | 1 - lib/librte_ivshmem/Makefile | 4 +++- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 474651b..698fa0a 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -40,7 +40,6 @@ VPATH += $(RTE_SDK)/lib/librte_eal/common/arch/$(ARCH_DIR) CFLAGS += -I$(SRCDIR)/include CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include -CFLAGS += -I$(RTE_SDK)/lib/librte_ring CFLAGS += $(WERROR_FLAGS) -O3 LDLIBS += -lexecinfo diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index e109361..30b30f3 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -44,9 +44,12 @@ VPATH += $(RTE_SDK)/lib/librte_eal/common CFLAGS += -I$(SRCDIR)/include CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include +ifeq ($(CONFIG_RTE_LIBRTE_IVSHMEM),y) +# workaround for circular dependency eal -> ivshmem -> ring/mempool -> eal CFLAGS += -I$(RTE_SDK)/lib/librte_ring CFLAGS += -I$(RTE_SDK)/lib/librte_mempool CFLAGS += -I$(RTE_SDK)/lib/librte_ivshmem +endif CFLAGS += $(WERROR_FLAGS) -O3 LDLIBS += -ldl diff --git a/lib/librte_eal/linuxapp/eal/eal_interrupts.c b/lib/librte_eal/linuxapp/eal/eal_interrupts.c index 06b26a9..a9af396 100644 --- a/lib/librte_eal/linuxapp/eal/eal_interrupts.c +++ b/lib/librte_eal/linuxapp/eal/eal_interrupts.c @@ -57,10 +57,8 @@ #include #include #include -#include #include #include -#include #include #include #include diff --git a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c index eea0314..67b3caf 100644 --- a/lib/librte_eal/linuxapp/eal/eal_ivshmem.c +++ b/lib/librte_eal/linuxapp/eal/eal_ivshmem.c @@ -49,7 +49,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/librte_ivshmem/Makefile b/lib/librte_ivshmem/Makefile index 16defdb..c099438 100644 --- a/lib/librte_ivshmem/Makefile +++ b/lib/librte_ivshmem/Makefile @@ -46,7 +46,9 @@ SRCS-$(CONFIG_RTE_LIBRTE_IVSHMEM) := rte_ivshmem.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_IVSHMEM)-include := rte_ivshmem.h -# this lib needs eal +# this lib needs EAL, ring and mempool +DEPDIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += lib/librte_eal +DEPDIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += lib/librte_ring DEPDIRS-$(CONFIG_RTE_LIBRTE_IVSHMEM) += lib/librte_mempool include $(RTE_SDK)/mk/rte.lib.mk -- 2.7.0