From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by dpdk.org (Postfix) with ESMTP id 6354D5F2D for ; Thu, 29 Mar 2018 23:24:15 +0200 (CEST) Received: by mail-wr0-f195.google.com with SMTP id f14so6551097wre.8 for ; Thu, 29 Mar 2018 14:24:15 -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 :in-reply-to:references; bh=s4VzvBrzdFW6CMkIi65DndUkdWRFgC1KR+LN7EUoYA8=; b=1uCmKMam/XdXk1A98/ENg2SodAMDTgtyPjQGq94rXydPUe8rgAAPidCryoK/XBf25v E25tJx7t4oHL1Dy/3AIdpjNsigHS7Wkz7KIbUVGmsSMYRIF5ZGvGT64KdnbN5MxuC0vo L8xDF3p1UGK7t5yKzm/Z7FQGKavrMuCNY2va5BvZ5sKa52yOQ368Z8hIfkAgg8B5jZ6j D96v/PITTZVREoYEpmQmIn4M5NxuvWjlpOAVu3Rt2+MQDUvK95y2ZUMUd8jttAWXGeYG u0Z5jyC/pjElTt+t6PqOVICSAx8o0ePRqFwx9ipglScdAtAmrAWsF1WROhBz/qqC/Ptr L0RA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=s4VzvBrzdFW6CMkIi65DndUkdWRFgC1KR+LN7EUoYA8=; b=aKXJsT4qRhUPqH4qxKY2h7mOxJr6VJNSlJEW8CE/c1CrVv9zzGFDD4SdQJv+ii/vOu QG+cE/IUbs/1L9S4cC/ij9apugW6nbnfWoIXRhPS5uMX5o51Xfp0dlGtInKEaGON+cPe us1qqY1oVwbAHsDXoRhxiObE2HJgQKFk8RSdWVqabyWKhS7me9B1D+ZmCcOh5ir4bjEM 6VwLh+xAfTo0JlJepF9j0ZqyHuFHTVYSkiC2F1POLXTyOZ/05iGgHtdmUMhq6xFaPz9z K5vfpnqRhazM1oMWIwsjBsKRnHx0NjZSv7pa0C+ETxRlWOwMcSiPfuqw9rtVJ5olLowo UhaQ== X-Gm-Message-State: AElRT7GdYowqBaGgsnX1LUk1OKPJz48QlMF57OcVWahZHUY42Obpgjpg P1jyJ7GqaezUfqYVaKNF57IbFSqi X-Google-Smtp-Source: AIpwx48IgGmtWnvPQ+vuc5YbVA2uSqvwutQpCFuV+PuyeHHP5uHl+RBqnjK3Vd2A1h/7sJL00Y//ng== X-Received: by 10.223.136.248 with SMTP id g53mr7517536wrg.78.1522358654669; Thu, 29 Mar 2018 14:24:14 -0700 (PDT) Received: from bidouze.dev.6wind.com. (host.78.145.23.62.rev.coltfrance.com. [62.23.145.78]) by smtp.gmail.com with ESMTPSA id m35sm11907457wrm.59.2018.03.29.14.24.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Mar 2018 14:24:13 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 29 Mar 2018 23:23:25 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 In-Reply-To: References: In-Reply-To: References: Subject: [dpdk-dev] [PATCH v4 01/20] kvargs: build before EAL X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Mar 2018 21:24:15 -0000 Signed-off-by: Gaetan Rivet --- lib/Makefile | 3 +-- lib/librte_eal/common/Makefile | 2 +- lib/librte_kvargs/Makefile | 3 ++- lib/librte_kvargs/rte_kvargs.c | 2 +- lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h | 0 5 files changed, 5 insertions(+), 5 deletions(-) rename lib/{librte_eal/common/include => librte_kvargs}/rte_string_fns.h (100%) diff --git a/lib/Makefile b/lib/Makefile index ec965a606..fc7a55a37 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -4,6 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += librte_compat +DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs DIRS-$(CONFIG_RTE_LIBRTE_EAL) += librte_eal DIRS-$(CONFIG_RTE_LIBRTE_PCI) += librte_pci DEPDIRS-librte_pci := librte_eal @@ -71,8 +72,6 @@ DEPDIRS-librte_flow_classify := librte_net librte_table librte_acl DIRS-$(CONFIG_RTE_LIBRTE_SCHED) += librte_sched DEPDIRS-librte_sched := librte_eal librte_mempool librte_mbuf librte_net DEPDIRS-librte_sched += librte_timer -DIRS-$(CONFIG_RTE_LIBRTE_KVARGS) += librte_kvargs -DEPDIRS-librte_kvargs := librte_eal DIRS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += librte_distributor DEPDIRS-librte_distributor := librte_eal librte_mbuf librte_ether DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile index ea824a3a8..75776d3e2 100644 --- a/lib/librte_eal/common/Makefile +++ b/lib/librte_eal/common/Makefile @@ -9,7 +9,7 @@ INC += rte_errno.h rte_launch.h rte_lcore.h INC += rte_log.h rte_memory.h rte_memzone.h INC += rte_per_lcore.h rte_random.h INC += rte_tailq.h rte_interrupts.h rte_alarm.h -INC += rte_string_fns.h rte_version.h +INC += rte_version.h INC += rte_eal_memconfig.h rte_malloc_heap.h INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile index 4eaa9334d..e026ecc21 100644 --- a/lib/librte_kvargs/Makefile +++ b/lib/librte_kvargs/Makefile @@ -37,7 +37,7 @@ include $(RTE_SDK)/mk/rte.vars.mk LIB = librte_kvargs.a CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -LDLIBS += -lrte_eal +CFLAGS += -I$(RTE_SDK)/lib/librte_eal/common/include EXPORT_MAP := rte_kvargs_version.map @@ -48,6 +48,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_KVARGS) := rte_kvargs.c # install includes INCS := rte_kvargs.h +INCS += rte_string_fns.h SYMLINK-$(CONFIG_RTE_LIBRTE_KVARGS)-include := $(INCS) include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_kvargs/rte_kvargs.c b/lib/librte_kvargs/rte_kvargs.c index d92a5f9dc..0a1abf579 100644 --- a/lib/librte_kvargs/rte_kvargs.c +++ b/lib/librte_kvargs/rte_kvargs.c @@ -7,8 +7,8 @@ #include #include -#include +#include "rte_string_fns.h" #include "rte_kvargs.h" /* diff --git a/lib/librte_eal/common/include/rte_string_fns.h b/lib/librte_kvargs/rte_string_fns.h similarity index 100% rename from lib/librte_eal/common/include/rte_string_fns.h rename to lib/librte_kvargs/rte_string_fns.h -- 2.11.0