From patchwork Wed Jul 11 21:44:54 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: 42897 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 1CC681B564; Wed, 11 Jul 2018 23:45:47 +0200 (CEST) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 5262A1B520 for ; Wed, 11 Jul 2018 23:45:43 +0200 (CEST) Received: by mail-wr1-f65.google.com with SMTP id j5-v6so13071418wrr.8 for ; Wed, 11 Jul 2018 14:45:43 -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=ncWdkWkBUDhfwJFPkOYFPhZNw9r3yQ9LG7nL5SJwlm4=; b=ctW3VE60/w8jFW81G1QxjLBVQEVjSKNyAYCicFmCc4HzmHhpWiJ3gbM4C04RbA7DcR REe68HnueJK8Esk9MtSJl0RfrKhgX52jKg3+Q1XrZPe1GaI4ctTX8fLhUWVMhtU2t2LG WNkttvmih01QSC9jSkmUAowVmav26t5ShEzAoGtlQX7t7Lf9GGtZorNWEzVJ/nV8yzW5 DIUCyF4atOmraiDCoZAaCL5SX0aT+YLx6HVlFUKzmPd8psdeRwcPw+kOWonlFWS0b9nh 53t6mjXSDYoorpc6pj3k0SQvsLQnjMTRBewZ/1vzPQ0X5yhMBAsSY7iCF+2gq+xmd3wV zNAA== 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=ncWdkWkBUDhfwJFPkOYFPhZNw9r3yQ9LG7nL5SJwlm4=; b=ZDENUNGJDPx+dUeQqL61a+Ri6ur9AfVaDaRgRiVIOujmyaQqU2tnNhSenOdrv4xYUv PBKPgOcYmZfvgURip5eJl7mz48JlS5vFU0ZpNWgs0dMMsotcl37oRewiFfuGJ0b+ILEc AAHgo7+wzsl3XUrbZES606VCNFskZFG6rybU0s/KfWvfhT5m0GtsixGnOxaqdxDhx/x1 V6HHYYBZopRfYYb887q2R644jKlJF6Cou9MuGZhReBusewOku1gP6aESNAb2akyeTq+D +IWfy1RrZyggXOAdKmH8zKOh3du/bXBHMiS9vp78LhFuYaDE1UzanIMF2EfrBpR9kizX ZQ6w== X-Gm-Message-State: AOUpUlHnDAz0vCdLhChKM46ebpAo1XAtY/RtH3Potqnovk7ZBe6zvRHy LUiKsncymtJFM9jBKuwZUQPDDXO0 X-Google-Smtp-Source: AAOMgpeuaCY63MR5v6+KwEoIHUHH2iZCaw+H85TiEoSPWiSP0x6iALWDb+U84VXpaqW7fKYRc83d0g== X-Received: by 2002:adf:8597:: with SMTP id 23-v6mr228787wrt.31.1531345542410; Wed, 11 Jul 2018 14:45:42 -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 h5-v6sm10550936wrr.19.2018.07.11.14.45.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 14:45:41 -0700 (PDT) From: Gaetan Rivet To: dev@dpdk.org Cc: Gaetan Rivet Date: Wed, 11 Jul 2018 23:44:54 +0200 Message-Id: <7cba3260cfb939032744960d13b1c348952733a4.1531345404.git.gaetan.rivet@6wind.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v11 04/25] 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" This library will be used by the EAL to parse parameters. 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)