From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9783BA04C3 for ; Fri, 22 Nov 2019 15:42:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A6072BC7; Fri, 22 Nov 2019 15:42:32 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 626101B948 for ; Fri, 22 Nov 2019 15:42:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574433750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LEi/PvJqAbhQ2UzbJF/zLxobFNrIgGVeGwpmvQD0pkk=; b=adFpV4QpvhdzmlCQsjnNQSE8WWRT3C53JS9XtU0Xr+14fiXIX1IZ8SaoVyaQ/DIKnCmGMV zUGD47tlXuTiVUm7YYmcCka7elIgY37IPUdPc81i/zlKw0Jr93EHp/Z8Loq46S6dlsNIZ6 zUFaV2l/viR8tsXPqMBOKe776oo+IEQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-JcawcNIjPuCPO76x6VGmAA-1; Fri, 22 Nov 2019 09:42:27 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D2EE8018A3; Fri, 22 Nov 2019 14:42:26 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.118.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id F3C0E9F4D; Fri, 22 Nov 2019 14:42:24 +0000 (UTC) From: Kevin Traynor To: Thomas Monjalon Cc: Luca Boccassi , Matan Azrad , dpdk stable Date: Fri, 22 Nov 2019 14:41:09 +0000 Message-Id: <20191122144131.21231-23-ktraynor@redhat.com> In-Reply-To: <20191122144131.21231-1-ktraynor@redhat.com> References: <20191122144131.21231-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: JcawcNIjPuCPO76x6VGmAA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/mlx: fix meson build with custom dependency path' has been queued to LTS release 18.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/29/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasi= ng (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/eadf2e59e4b2fee0af= 198aab2fd2d49961323d40 Thanks. Kevin. --- >From eadf2e59e4b2fee0af198aab2fd2d49961323d40 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 13 Aug 2019 01:03:55 +0200 Subject: [PATCH] net/mlx: fix meson build with custom dependency path [ upstream commit de38dd8cf5e60d9d87eefe9f2cb60a35d4d86705 ] 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=3D$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") Suggested-by: Luca Boccassi Signed-off-by: Thomas Monjalon Acked-by: Luca Boccassi Acked-by: Matan Azrad --- drivers/net/mlx4/meson.build | 6 +++--- drivers/net/mlx5/meson.build | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 7de571e2a..a416c68f3 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -65,5 +65,5 @@ if build =09# input array for meson member search: =09# [ "MACRO to define if found", "header for the search", -=09# "symbol to search","struct member to search" ] +=09# "symbol to search", "struct member to search" ] =09# =09has_member_args =3D [ @@ -73,7 +73,7 @@ if build =09config =3D configuration_data() =09foreach arg:has_member_args -=09=09file_prefix =3D '#include<' + arg[1] + '>' +=09=09file_prefix =3D '#include <' + arg[1] + '>' =09=09config.set(arg[0], cc.has_member(arg[2], arg[3], -=09=09=09prefix : file_prefix)) +=09=09=09prefix: file_prefix, dependencies: libs)) =09endforeach =09configure_file(output : 'mlx4_autoconf.h', configuration : config) diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index de0c32bcf..81965bddc 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -250,10 +250,11 @@ if build =09config =3D configuration_data() =09foreach arg:has_sym_args -=09=09config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) +=09=09config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], +=09=09=09dependencies: libs)) =09endforeach =09foreach arg:has_member_args -=09=09file_prefix =3D '#include<' + arg[1] + '>' +=09=09file_prefix =3D '#include <' + arg[1] + '>' =09=09config.set(arg[0], cc.has_member(arg[2], arg[3], -=09=09=09prefix : file_prefix)) +=09=09=09prefix : file_prefix, dependencies: libs)) =09endforeach =09configure_file(output : 'mlx5_autoconf.h', configuration : config) --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-11-22 14:36:56.456686712 +0000 +++ 0023-net-mlx-fix-meson-build-with-custom-dependency-path.patch=092019-1= 1-22 14:36:55.191149414 +0000 @@ -1 +1 @@ -From de38dd8cf5e60d9d87eefe9f2cb60a35d4d86705 Mon Sep 17 00:00:00 2001 +From eadf2e59e4b2fee0af198aab2fd2d49961323d40 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit de38dd8cf5e60d9d87eefe9f2cb60a35d4d86705 ] + @@ -19 +20,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ - drivers/net/mlx4/meson.build | 9 +++++---- + drivers/net/mlx4/meson.build | 6 +++--- @@ -28 +29 @@ - 2 files changed, 9 insertions(+), 7 deletions(-) + 2 files changed, 7 insertions(+), 6 deletions(-) @@ -31 +32 @@ -index 028cd97fa..efee45776 100644 +index 7de571e2a..a416c68f3 100644 @@ -34 +35 @@ -@@ -77,5 +77,5 @@ if build +@@ -65,5 +65,5 @@ if build @@ -41 +42 @@ -@@ -94,10 +94,11 @@ if build +@@ -73,7 +73,7 @@ if build @@ -43,5 +43,0 @@ - =09foreach arg:has_sym_args --=09=09config.set(arg[0], cc.has_header_symbol(arg[1], arg[2])) -+=09=09config.set(arg[0], cc.has_header_symbol(arg[1], arg[2], -+=09=09=09dependencies: libs)) - =09endforeach @@ -57 +53 @@ -index 62b41caf1..3c5144c9b 100644 +index de0c32bcf..81965bddc 100644 @@ -60 +56 @@ -@@ -178,10 +178,11 @@ if build +@@ -250,10 +250,11 @@ if build