From patchwork Mon Aug 12 23:03:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 57630 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 94EFC1BE94; Tue, 13 Aug 2019 01:04:18 +0200 (CEST) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by dpdk.org (Postfix) with ESMTP id 380241BDFD; Tue, 13 Aug 2019 01:04:17 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 8B0CA22076; Mon, 12 Aug 2019 19:04:16 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Mon, 12 Aug 2019 19:04:16 -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=f4vMD1g1rj 211mrM0GlGrdCu2+9IPXPMZnNjJDzEMpo=; b=LYHnSgcWXyuO20k9u3Bmr+dG0f 55yEvMK7EA2FtoUGhhq0cDDLWSvdXYb3sJ8AOyh+vjL6SWY+w9rRC0YFe9DR4LVr uPvXXaIAUfNTHH7CX8h8i5ds9ZfgOQu9zM7k+nVdZ5Y3inP/aQ+y0GWqCHJrzvsp p9LNWCudqSyfyaUdg= 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=f4vMD1g1rj211mrM0GlGrdCu2+9IPXPMZnNjJDzEMpo=; b=eCA4MeoD ybtX7lWhYPiu7zTxuW8IHXJW4msapmwsRwVnsWguVqSPzDFq9Cl9K678J2NyJV/A LoWeN+pNDuxT8MaIeoE7/z2T4+fuYezDAWc1eC9EAM2xsot+Ax5KF8OmWoA36TIk sF/PEFn29tZnP9UQ9PrfpyRsXMVcP+cW1UvhwmD9KpUuCzloum2T1yUVwFnAA83y 5WFI6s9TfLWrtRR+zhztv7sSg9iL9XSnlphQaRmlwZdtSaQIpXokszZ0CqqVPhbT WrIC6kSgyItKY8eZDkbrsROlCXhlNzFlOokwsx5of4pcUdl4DBzH/B1zMmHCdL8H O3w7nIbQQq3hNw== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddruddvhedgudelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefvhhhomhgr shcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlhhonhdrnhgvtheqnecukf hppeejjedrudefgedrvddtfedrudekgeenucfrrghrrghmpehmrghilhhfrhhomhepthhh ohhmrghssehmohhnjhgrlhhonhdrnhgvthenucevlhhushhtvghrufhiiigvpedv 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 12B5E80061; Mon, 12 Aug 2019 19:04:14 -0400 (EDT) From: Thomas Monjalon To: bruce.richardson@intel.com, Matan Azrad , Shahaf Shuler , Yongseok Koh , Viacheslav Ovsiienko Cc: dev@dpdk.org, stable@dpdk.org, Luca Boccassi Date: Tue, 13 Aug 2019 01:03:55 +0200 Message-Id: <20190812230358.988-4-thomas@monjalon.net> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190812230358.988-1-thomas@monjalon.net> References: <20190812230358.988-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/6] net/mlx: fix meson build with custom dependency path 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" If rdma-core is not installed in a standard directory of the system, it is possible to specify the location of the pkgconfig file via an environment variable: PKG_CONFIG_PATH=$PKG_CONFIG_PATH:~/rdma-core/build/lib/pkgconfig In this case, the dependency may become mandatory to specify for the configuration tests (checking dependency symbols or fields). Some spacing is also fixed around. Fixes: 8e4937640022 ("net/mlx4: add external allocator for Verbs object") Fixes: 1dd7c7e38c19 ("net/mlx4: support meson build") Fixes: 96d7c62a70c7 ("net/mlx5: support meson build") Cc: stable@dpdk.org Suggested-by: Luca Boccassi Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi Acked-by: Matan Azrad --- drivers/net/mlx4/meson.build | 9 +++++---- drivers/net/mlx5/meson.build | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 028cd97fa..efee45776 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -76,7 +76,7 @@ if build # mlx4_autoconf.h file is still generated. # input array for meson member search: # [ "MACRO to define if found", "header for the search", - # "symbol to search","struct member to search" ] + # "symbol to search", "struct member to search" ] # has_member_args = [ [ 'HAVE_IBV_MLX4_WQE_LSO_SEG', 'infiniband/mlx4dv.h', @@ -93,12 +93,13 @@ if build ] config = configuration_data() foreach arg:has_sym_args - config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) + config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], + dependencies: libs)) endforeach foreach arg:has_member_args - file_prefix = '#include<' + arg[1] + '>' + file_prefix = '#include <' + arg[1] + '>' config.set(arg[0], cc.has_member(arg[2], arg[3], - prefix : file_prefix)) + prefix: file_prefix, dependencies: libs)) endforeach configure_file(output : 'mlx4_autoconf.h', configuration : config) endif diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 62b41caf1..3c5144c9b 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -177,12 +177,13 @@ if build ] config = configuration_data() foreach arg:has_sym_args - config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) + config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], + dependencies: libs)) endforeach foreach arg:has_member_args - file_prefix = '#include<' + arg[1] + '>' + file_prefix = '#include <' + arg[1] + '>' config.set(arg[0], cc.has_member(arg[2], arg[3], - prefix : file_prefix)) + prefix : file_prefix, dependencies: libs)) endforeach configure_file(output : 'mlx5_autoconf.h', configuration : config) endif