From patchwork Thu Jul 5 11:48:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ga=C3=ABtan_Rivet?= X-Patchwork-Id: 42338 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 [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 324801BEE4; Thu, 5 Jul 2018 13:49:10 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 629841BEC0 for ; Thu, 5 Jul 2018 13:49:01 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id u7-v6so1013356wrn.12 for ; Thu, 05 Jul 2018 04:49:01 -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=nQ98j6qRpUh5Sw+AkRzfOmFP69ilY/mlJDYmjk8fB48=; b=Zzoa3zVdlNSTxbOPtNC62c/1Z+4I3bPGhADSrPNM7tcF9p1XMTw52RvLHW+FRqPk3f g1ElxZwzAGQb7oSO/bsDD/b/2/W0N0skhFru8454rxS/dsec3jak81WytlU2SrT6TBtB GTyIbVevpw+iPL/ygswM+/57NXxkjedw3WD5sta5M52CbWd7qMd2gz87mVdDEgoCas7Y qUOKOBaIVrSNvGXJaaCMBIzt2Gm/a9dZMUodj6l5RfCLa61cxQoPH0pDFd0JXQOwz5wu 1lNfz/vmm1deMgfSNLsgQ24XyLAdyVouvKbjjJOSTKfwH8zrzsNU5f8KiR/Zz3VZSKEU OtoA== 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; bh=nQ98j6qRpUh5Sw+AkRzfOmFP69ilY/mlJDYmjk8fB48=; b=EJP1LUPrp69D0Js/O2SceU9IetDJ2oCbNs8lmTCktygPmT8AmNgvd5TPe4a2YRKdnG PHUgTwuq4MjGYskDkcXjp1tLkgbC/zLx83YhMzmIiATlQKGY3PT55OR5wQpb7X7xmQYF aIjexEz1u1iEgi2uhbwCZhVAEWJj7jgSAV0Nd0tQ8w1Q6yu39f9gFIDM3BnGvC4zRogz HPiiLBfrZj1j6balurrbT6qrED6ZyhrnqgDV2gYST2d8uCgaEp5+nTbLeDmz6R7N02fv 2DIJXxD1PySB5qKvXpReN2B7ququmeXRutHPZyeNX0PgwqR+Fe9A3FiiGZJyhRTIty2J p6Bg== X-Gm-Message-State: APt69E2SQC13UT63KEx+Vh/+Pb2jbBe+vY9leW9rVTxPwO7vdwISYeGT 0DsPKxeJwVnQkI6SYJZuSTwgOAyT X-Google-Smtp-Source: AAOMgpcVlHquwYSXrb+uTJw552ryupmQjcdoR4k4u/elx7+HjGLlcPPSMqfGzjAjcNmiG9S4Y+md/Q== X-Received: by 2002:adf:a197:: with SMTP id u23-v6mr4670746wru.50.1530791340687; Thu, 05 Jul 2018 04:49:00 -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 o42-v6sm15809183wrc.50.2018.07.05.04.48.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Jul 2018 04:48:59 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Thu, 5 Jul 2018 13:48:10 +0200 Message-Id: <6180e28453a34b92cf179a5e2c820bc3f31422d4.1530791217.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v10 03/27] 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Signed-off-by: Gaetan Rivet --- lib/Makefile | 3 +-- lib/librte_eal/meson.build | 1 + lib/librte_kvargs/Makefile | 2 +- lib/librte_kvargs/meson.build | 3 +++ lib/meson.build | 8 ++++++-- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lib/Makefile b/lib/Makefile index d82462ba2..e8e903c8f 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 @@ -76,8 +77,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_ethdev DIRS-$(CONFIG_RTE_LIBRTE_PORT) += librte_port diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index 4aa63e3d0..259bb4464 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -24,6 +24,7 @@ endif version = 7 # the version of the EAL API allow_experimental_apis = true deps += 'compat' +deps += 'kvargs' cflags += '-D_GNU_SOURCE' sources = common_sources + env_sources objs = common_objs + env_objs diff --git a/lib/librte_kvargs/Makefile b/lib/librte_kvargs/Makefile index 39d5ac33d..875939547 100644 --- a/lib/librte_kvargs/Makefile +++ b/lib/librte_kvargs/Makefile @@ -7,7 +7,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 diff --git a/lib/librte_kvargs/meson.build b/lib/librte_kvargs/meson.build index 0c5b9cb20..0a81e8da7 100644 --- a/lib/librte_kvargs/meson.build +++ b/lib/librte_kvargs/meson.build @@ -1,6 +1,9 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +includes = [global_inc] +includes += include_directories('../../../lib/librte_eal/common/include') + version = 1 sources = files('rte_kvargs.c') headers = files('rte_kvargs.h') diff --git a/lib/meson.build b/lib/meson.build index 9d11571f9..5f7eb310e 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -9,7 +9,8 @@ # given as a dep, no need to mention ring. This is especially true for the # core libs which are widely reused, so their deps are kept to a minimum. libraries = [ 'compat', # just a header, used for versioning - 'eal', 'ring', 'mempool', 'mbuf', 'net', 'kvargs', 'ethdev', 'pci', # core + 'kvargs', + 'eal', 'ring', 'mempool', 'mbuf', 'net', 'ethdev', 'pci', # core 'metrics', # bitrate/latency stats depends on this 'hash', # efd depends on this 'timer', # eventdev depends on this @@ -41,9 +42,12 @@ foreach l:libraries # external package/library requirements ext_deps = [] deps = ['eal'] # eal is standard dependency except for itself - if l == 'eal' + if l == 'kvargs' deps = [] endif + if l == 'eal' + deps = ['kvargs'] + endif dir_name = 'librte_' + l subdir(dir_name)