[dpdk-stable] patch 'net/mlx: fix meson build with custom dependency path' has been queued to LTS release 18.11.6

[Kevin Traynor]

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 rebasing
(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/eadf2e59e4b2fee0af198aab2fd2d49961323d40

Thanks.

Kevin.

---
>From eadf2e59e4b2fee0af198aab2fd2d49961323d40 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
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=$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 <bluca at debian.org>
Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Luca Boccassi <bluca at debian.org>
Acked-by: Matan Azrad <matan at mellanox.com>
---
 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
 	# 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 = [
@@ -73,7 +73,7 @@ if build
 	config = configuration_data()
 	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)
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
 	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)
-- 
2.21.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-11-22 14:36:56.456686712 +0000
+++ 0023-net-mlx-fix-meson-build-with-custom-dependency-path.patch	2019-11-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 at 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 @@
- 	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
@@ -57 +53 @@
-index 62b41caf1..3c5144c9b 100644
+index de0c32bcf..81965bddc 100644
@@ -60 +56 @@
-@@ -178,10 +178,11 @@ if build
+@@ -250,10 +250,11 @@ if build