From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gaetan.rivet@6wind.com>
Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com
[209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 0957F1B3F8
for <dev@dpdk.org>; Sun, 15 Apr 2018 17:08:12 +0200 (CEST)
Received: by mail-wr0-f196.google.com with SMTP id q13so15870370wre.3
for <dev@dpdk.org>; Sun, 15 Apr 2018 08:08: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
:in-reply-to:references;
bh=m3/MBPOttSbrLuHzH4p2mWwyntvsGOYaNTU52my93DM=;
b=as9JoY7H7L5/Qrxt3M7bQCzie4AS5lZuqruuO6eaQnF6T7B6VgAJgFMIHffaLp8nDN
g+esfHxFNxbCP29zElSI49D5qTeFydo2acXdc2pYjO60eqC/IgPdUle64xpJ5ToVvZAh
Xt0zirPyuAKuVk5deTZ2dK0Szfrp0uUGa0pWnig1IPF3z6mQ3yQIx1GiHY/qoWOjoVfl
/ky2oYbEjZgWw0YnNIPmp40Fs2Wf3Gx2K8yWXwMZIBvgZvc9l6rRvJz0j48h1zOix765
stmlcsYh4a3h1TB09lxwQvw8YTNof+4lIn0IUSkFJljhTwBZROC/KZJj/nB/2oyR4eTL
y0Ww==
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=m3/MBPOttSbrLuHzH4p2mWwyntvsGOYaNTU52my93DM=;
b=WSb/Lx36Zj1lxSxw28VIDFKhn2+AXugRO6ynIvjr9vPleX5uEaySp5xl1qLN/NxSPz
Fg+uEyJ3iCg1aHaFzYF7MCvH3FE5rGkGJw/Mt/LzvgdnBsnvis0r5Y3VgMBO1UyJjff5
DAIZtIRlST1uMcbmXZ1vDVW8I3Ii2KtF/BH/t1n2kMnJQ/zag0raWg1jJvzTnE7giWQV
Cgfu/n7CxS//ZiKbV6g4zPt4qqOnk8/qofP++DukldIInDyyz/9U8H03nrkyVLaGjVRk
HBWHnWrhLmps2ewcgKa2m9YxHuPHfI9mdOp0LeV6wyo2JMBQa32rIaYZi33ky+OoTou6
ugiQ==
X-Gm-Message-State: ALQs6tDyO5Yqf6iW/h/ShdpOTZHe06Bcraf/c2HX+/h3X+wg1OQ0efi/
BZAqhNTCrhKLnHn5koOtA7CS/yxF
X-Google-Smtp-Source: AIpwx4/VV+ieBM63eS4L02Zzd7MAQh9HpOdeHAUZV355dCoUEdI2h3Kcvl6RSHhfQ3o1nuJDP1gSpA==
X-Received: by 10.223.193.5 with SMTP id r5mr7687950wre.274.1523804891383;
Sun, 15 Apr 2018 08:08:11 -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 r200sm13673438wmb.39.2018.04.15.08.08.10
(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
Sun, 15 Apr 2018 08:08:10 -0700 (PDT)
From: Gaetan Rivet <gaetan.rivet@6wind.com>
To: dev@dpdk.org
Cc: Gaetan Rivet <gaetan.rivet@6wind.com>
Date: Sun, 15 Apr 2018 17:07:30 +0200
Message-Id: <26f020df392dcaa7f50dce1048af9526bf4cb8ab.1523804657.git.gaetan.rivet@6wind.com>
X-Mailer: git-send-email 2.11.0
In-Reply-To: <cover.1523804657.git.gaetan.rivet@6wind.com>
References: <cover.1521124599.git.gaetan.rivet@6wind.com>
<cover.1523804657.git.gaetan.rivet@6wind.com>
In-Reply-To: <cover.1523804657.git.gaetan.rivet@6wind.com>
References: <cover.1523804657.git.gaetan.rivet@6wind.com>
Subject: [dpdk-dev] [PATCH v7 01/22] kvargs: build before EAL
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Apr 2018 15:08:12 -0000
Signed-off-by: Gaetan Rivet <gaetan.rivet@6wind.com>
---
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 48f870f24..dbd19331b 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 <stdlib.h>
#include <rte_log.h>
-#include <rte_string_fns.h>
+#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