From patchwork Sat Sep 14 09:36:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 59246 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 48AD51EB22; Sat, 14 Sep 2019 11:37:29 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id E5E2D1EB09; Sat, 14 Sep 2019 11:37:26 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 6B8C921368; Sat, 14 Sep 2019 05:37:25 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 14 Sep 2019 05:37:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=AvElL286BF QPiUL/tInjqvxY40I97SCECKH6NTBpr/k=; b=Isp0U8iHK7y8RZq64gAW6HhhJF Kb3JTwFZBgnNfPvKNxfsHMQFftzoqQ7970NrPzzNAZXEfzfOty+8o5Xf2OoNNFUT yxGX43N0kb7j4q9sq7xcWmDHIUlnuPC6dkMPhi8AwsIMuYSLuNNJqvF/7PIeeUWV GdFuz8qDqo1nUtBxw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=AvElL286BFQPiUL/tInjqvxY40I97SCECKH6NTBpr/k=; b=fiGEt7mV AAJ1ZXY8wcj3zoLSPKk+sGeMOwzjSwM0sp2+FRhyUsxJXUICwwRLpnugBbYf75XW dzNXpNTPAH9wIKzqTqgkfdxoqFO/WUZk5vKHlFBvMjVOzDMHWzMMVK+lOLZyj1YT 7wgaofSInd5J2wqaeexu64eCJnLAlDH/n6Pyr66HVoEgZBwkPwiXwHxtgbfHCqav mFM0zZNJIaWEitaGyaSIRefMIEPJHfis+mHcvoSqDZT1D5xxjE1izrmqbmP2MoXW xzLpbfqQbYPl9KbUJkAGrgF72/xGVRGReLDoO56vWt38RT/EMDbHz+L52agfT56P 91gP/sDJvEKUrQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrtdelgddukecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph epjeejrddufeegrddvtdefrddukeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhho mhgrshesmhhonhhjrghlohhnrdhnvghtnecuvehluhhsthgvrhfuihiivgeptd X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 77579D6005A; Sat, 14 Sep 2019 05:37:24 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Rastislav Cernay , Jan Remes Cc: dev@dpdk.org, stable@dpdk.org Date: Sat, 14 Sep 2019 11:36:59 +0200 Message-Id: <20190914093700.11451-2-thomas@monjalon.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190914093700.11451-1-thomas@monjalon.net> References: <20190914093700.11451-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/2] net/nfb: fix dependency check 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" The library libnfb is part of netcope-common which provides a pkg-config file: netcope-common.pc. Looking for this .pc file - with dependency() - is preferred than looking for the library - with cc.find_library(). If the library is not installed in a standard path, it can be found thanks to PKG_CONFIG_PATH variable. The previous solution required to use CFLAGS and LDFLAGS environment variables. Fixes: 6435f9a0ac22 ("net/nfb: add new netcope driver") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Jan Remes --- drivers/net/nfb/meson.build | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build index 4502c3f76..d53e8eca7 100644 --- a/drivers/net/nfb/meson.build +++ b/drivers/net/nfb/meson.build @@ -3,14 +3,9 @@ # Copyright(c) 2019 Netcope Technologies, a.s. # All rights reserved. -dep = cc.find_library('nfb', required: false) +dep = dependency('netcope-common', required: false) reason = 'missing dependency, "libnfb"' - -build = dep.found() and cc.has_header('nfb/nfb.h', dependencies: dep) - -nc = dependency('netcope-common', required: false) - +build = dep.found() ext_deps += dep -ext_deps += nc sources = files('nfb_rx.c', 'nfb_tx.c', 'nfb_stats.c', 'nfb_ethdev.c', 'nfb_rxmode.c') From patchwork Sat Sep 14 09:37:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 59247 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 BDB5E1EB57; Sat, 14 Sep 2019 11:37:33 +0200 (CEST) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) by dpdk.org (Postfix) with ESMTP id 2B1511EB21; Sat, 14 Sep 2019 11:37:32 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id CB92B210F2; Sat, 14 Sep 2019 05:37:31 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 14 Sep 2019 05:37:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=UrbS+2AFdX TGrc0Nd28eIdn9wvTczP/Xk8Ir73B7Xk8=; b=XYIOcVU+Fqsepd9lyeWaBCTQ1F OWDLdOwufCFwiezBzxst1XTjtxLj4rcslFib9jxoz/RmOhVVpgpBfFMuXiiR6gpC 6biA8rwVfXvG+YGi8ZPun4hCrxSwXbvIbh7MJPx4A4dBXLKPn2TcbEaRDZAXsgc4 PIul8zaGtUvaGn6Qk= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=UrbS+2AFdXTGrc0Nd28eIdn9wvTczP/Xk8Ir73B7Xk8=; b=TdOkee75 CdpoUgOW0DED7dw4kjGRL3HoE1qOicS8SSoBEUn2H5QUd2vaIcNgdsobY5VQrIqY UZjZrNgVXiwnLuVTwvRxncQt2BF0Dtj/VAldW2QJIeKzHcijfKqEe1YbZXKv/aqu /3mvZE7ol+mMmPqwEA+VRFcYWAv8wPQLvJJZJgpMy/GJXMX4KqjtXC/dgDrxdkrt GcrVwMYpK8KLhKoQ4afdPEZU4bmZgLCF/icHaHuwZHFRPg+taBZPI3rUBU/FVFva 7SvKH3sLcbPNwnMxQ94gadWllVGSyFXD+8iprjfV86vawFe7Xj0E7zY0bgaxuv/E ootmbVHuuxJ6dA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedufedrtdelgddukecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvffufffkofgjfhgggfestdekredtredttdenucfhrhhomhepvfhhohhmrghs ucfoohhnjhgrlhhonhcuoehthhhomhgrshesmhhonhhjrghlohhnrdhnvghtqeenucfkph epjeejrddufeegrddvtdefrddukeegnecurfgrrhgrmhepmhgrihhlfhhrohhmpehthhho mhgrshesmhhonhhjrghlohhnrdhnvghtnecuvehluhhsthgvrhfuihiivgepud X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id E6936D6005A; Sat, 14 Sep 2019 05:37:30 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Jan Remes , Rastislav Cernay Cc: dev@dpdk.org, stable@dpdk.org Date: Sat, 14 Sep 2019 11:37:00 +0200 Message-Id: <20190914093700.11451-3-thomas@monjalon.net> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190914093700.11451-1-thomas@monjalon.net> References: <20190914093700.11451-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 2/2] net/szedata2: fix dependency check 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" The library libsze2 provides a pkg-config file: libsze2.pc. Looking for this .pc file - with dependency() - is preferred than looking for the library - with cc.find_library(). If the library is not installed in a standard path, it can be found thanks to PKG_CONFIG_PATH variable. The previous solution required to use CFLAGS and LDFLAGS environment variables. Fixes: 508cfe6be9f1 ("net/szedata2: add to meson build") Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Jan Remes --- drivers/net/szedata2/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build index 032b42518..b53fcbc59 100644 --- a/drivers/net/szedata2/meson.build +++ b/drivers/net/szedata2/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -dep = cc.find_library('sze2', required: false) +dep = dependency('libsze2', required: false) build = dep.found() reason = 'missing dependency, "libsze2"' ext_deps += dep