net/mlx: fix meson build with custom dependency path

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 <bluca@debian.org>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Luca Boccassi <bluca@debian.org>
Acked-by: Matan Azrad <matan@mellanox.com>

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 028cd97..efee457 100644 (file)
--- 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 62b41ca..3c5144c 100644 (file)
--- 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