[dpdk-stable] patch 'net/mlx: fix overlinking with meson and glue dlopen' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. 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.

Thanks.

Luca Boccassi

---
>From 3253622dc4630e11207629aba50293049938ec20 Mon Sep 17 00:00:00 2001
From: Thomas Monjalon <thomas at monjalon.net>
Date: Wed, 12 Feb 2020 23:07:08 +0100
Subject: [PATCH] net/mlx: fix overlinking with meson and glue dlopen

[ upstream commit e21492a5175af31ae568fa5fabef1f4b22706962 ]

If ibverbs_link is dlopen, the PMD and application should not
be linked with ibverbs, but the glue library is.
Unfortunately the ibverbs dependency was exported in the
variable ext_deps, so there were overlinking.

It is fixed by not exporting the dependency in ext_deps,
and recreating a limited dependency object for cflags only.

Fixes: 1dd7c7e38c19 ("net/mlx4: support meson build")
Fixes: 96d7c62a70c7 ("net/mlx5: support meson build")
Cc: stable at dpdk.org

Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/net/mlx4/meson.build | 6 ++++--
 drivers/net/mlx5/meson.build | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 17711f154b..ff7386aee2 100644
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -31,7 +31,7 @@ foreach libname:libnames
 	endif
 	if lib.found()
 		libs += lib
-		if not static_ibverbs
+		if not static_ibverbs and not dlopen_ibverbs
 			ext_deps += lib
 		endif
 	else
@@ -41,10 +41,12 @@ foreach libname:libnames
 endforeach
 
 if build
-	if static_ibverbs
+	if static_ibverbs or dlopen_ibverbs
 		# Build without adding shared libs to Requires.private
 		ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
 		ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+	endif
+	if static_ibverbs
 		# Add static deps ldflags to internal apps and Libs.private
 		ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
 		ext_deps += declare_dependency(link_args:ibv_ldflags.split())
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index e21f3d8dc8..dab1b83fd3 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -41,10 +41,12 @@ foreach libname:libnames
 endforeach
 
 if build
-	if static_ibverbs
+	if static_ibverbs or dlopen_ibverbs
 		# Build without adding shared libs to Requires.private
 		ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
 		ext_deps += declare_dependency(compile_args: ibv_cflags.split())
+	endif
+	if static_ibverbs
 		# Add static deps ldflags to internal apps and Libs.private
 		ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
 		ext_deps += declare_dependency(link_args:ibv_ldflags.split())
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.322654671 +0000
+++ 0036-net-mlx-fix-overlinking-with-meson-and-glue-dlopen.patch	2020-02-17 17:00:15.355951135 +0000
@@ -1,8 +1,10 @@
-From e21492a5175af31ae568fa5fabef1f4b22706962 Mon Sep 17 00:00:00 2001
+From 3253622dc4630e11207629aba50293049938ec20 Mon Sep 17 00:00:00 2001
 From: Thomas Monjalon <thomas at monjalon.net>
 Date: Wed, 12 Feb 2020 23:07:08 +0100
 Subject: [PATCH] net/mlx: fix overlinking with meson and glue dlopen
 
+[ upstream commit e21492a5175af31ae568fa5fabef1f4b22706962 ]
+
 If ibverbs_link is dlopen, the PMD and application should not
 be linked with ibverbs, but the glue library is.
 Unfortunately the ibverbs dependency was exported in the
@@ -18,42 +20,15 @@
 Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
 ---
- drivers/common/mlx5/meson.build | 6 ++++--
- drivers/net/mlx4/meson.build    | 6 ++++--
- 2 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build
-index ea98e61fcd..141739fd6f 100644
---- a/drivers/common/mlx5/meson.build
-+++ b/drivers/common/mlx5/meson.build
-@@ -29,7 +29,7 @@ foreach libname:libnames
- 	endif
- 	if lib.found()
- 		libs += lib
--		if not static_ibverbs
-+		if not static_ibverbs and not dlopen_ibverbs
- 			ext_deps += lib
- 		endif
- 	else
-@@ -38,10 +38,12 @@ foreach libname:libnames
- 		subdir_done()
- 	endif
- endforeach
--if static_ibverbs
-+if static_ibverbs or dlopen_ibverbs
- 	# Build without adding shared libs to Requires.private
- 	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
- 	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
-+endif
-+if static_ibverbs
- 	# Add static deps ldflags to internal apps and Libs.private
- 	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
- 	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+ drivers/net/mlx4/meson.build | 6 ++++--
+ drivers/net/mlx5/meson.build | 4 +++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
 diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
-index f66e70f4d1..c598745730 100644
+index 17711f154b..ff7386aee2 100644
 --- a/drivers/net/mlx4/meson.build
 +++ b/drivers/net/mlx4/meson.build
-@@ -30,7 +30,7 @@ foreach libname:libnames
+@@ -31,7 +31,7 @@ foreach libname:libnames
  	endif
  	if lib.found()
  		libs += lib
@@ -62,20 +37,38 @@
  			ext_deps += lib
  		endif
  	else
-@@ -39,10 +39,12 @@ foreach libname:libnames
- 		subdir_done()
- 	endif
+@@ -41,10 +41,12 @@ foreach libname:libnames
+ endforeach
+ 
+ if build
+-	if static_ibverbs
++	if static_ibverbs or dlopen_ibverbs
+ 		# Build without adding shared libs to Requires.private
+ 		ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+ 		ext_deps += declare_dependency(compile_args: ibv_cflags.split())
++	endif
++	if static_ibverbs
+ 		# Add static deps ldflags to internal apps and Libs.private
+ 		ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+ 		ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
+index e21f3d8dc8..dab1b83fd3 100644
+--- a/drivers/net/mlx5/meson.build
++++ b/drivers/net/mlx5/meson.build
+@@ -41,10 +41,12 @@ foreach libname:libnames
  endforeach
--if static_ibverbs
-+if static_ibverbs or dlopen_ibverbs
- 	# Build without adding shared libs to Requires.private
- 	ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
- 	ext_deps += declare_dependency(compile_args: ibv_cflags.split())
-+endif
-+if static_ibverbs
- 	# Add static deps ldflags to internal apps and Libs.private
- 	ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
- 	ext_deps += declare_dependency(link_args:ibv_ldflags.split())
+ 
+ if build
+-	if static_ibverbs
++	if static_ibverbs or dlopen_ibverbs
+ 		# Build without adding shared libs to Requires.private
+ 		ibv_cflags = run_command(pkgconf, '--cflags', 'libibverbs').stdout()
+ 		ext_deps += declare_dependency(compile_args: ibv_cflags.split())
++	endif
++	if static_ibverbs
+ 		# Add static deps ldflags to internal apps and Libs.private
+ 		ibv_ldflags = run_command(ldflags_ibverbs_static, check:true).stdout()
+ 		ext_deps += declare_dependency(link_args:ibv_ldflags.split())
 -- 
 2.20.1