[dpdk-stable] patch 'test: fix rpath for drivers with meson' has been queued to stable release 19.11.4

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 07/26/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 e427f713e45fb6d153cc210ca0db43daf961ce85 Mon Sep 17 00:00:00 2001
From: Timothy Redaelli <tredaelli at redhat.com>
Date: Wed, 1 Jul 2020 19:16:38 +0200
Subject: [PATCH] test: fix rpath for drivers with meson

[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ]

This commit fixes the setting of relative rpath on dpdk-test for
drivers ($libdir/dpdk/pmd-$abiver) to the correct absolute rpath
($prefix$libdir/dpdk/pmd-$abiver).

Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test")

Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 app/test/meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/test/meson.build b/app/test/meson.build
index d7d0e7871..3b2774b3e 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -393,7 +393,8 @@ dpdk_test = executable('dpdk-test',
 	link_whole: link_libs,
 	dependencies: test_dep_objs,
 	c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
-	install_rpath: driver_install_path,
+	install_rpath: join_paths(get_option('prefix'),
+			 driver_install_path),
 	install: true)
 
 # some perf tests (eg: memcpy perf autotest)take very long
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-07-24 12:53:51.836608003 +0100
+++ 0085-test-fix-rpath-for-drivers-with-meson.patch	2020-07-24 12:53:48.311006907 +0100
@@ -1,14 +1,15 @@
-From f62093e7390d39c160205a4915ce0b4de116a0c3 Mon Sep 17 00:00:00 2001
+From e427f713e45fb6d153cc210ca0db43daf961ce85 Mon Sep 17 00:00:00 2001
 From: Timothy Redaelli <tredaelli at redhat.com>
 Date: Wed, 1 Jul 2020 19:16:38 +0200
 Subject: [PATCH] test: fix rpath for drivers with meson
 
+[ upstream commit f62093e7390d39c160205a4915ce0b4de116a0c3 ]
+
 This commit fixes the setting of relative rpath on dpdk-test for
 drivers ($libdir/dpdk/pmd-$abiver) to the correct absolute rpath
 ($prefix$libdir/dpdk/pmd-$abiver).
 
 Fixes: b5dc795a8a55 ("test: build app with meson as dpdk-test")
-Cc: stable at dpdk.org
 
 Signed-off-by: Timothy Redaelli <tredaelli at redhat.com>
 Acked-by: Bruce Richardson <bruce.richardson at intel.com>
@@ -17,19 +18,19 @@
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/app/test/meson.build b/app/test/meson.build
-index 56591db4e..39f295d73 100644
+index d7d0e7871..3b2774b3e 100644
 --- a/app/test/meson.build
 +++ b/app/test/meson.build
-@@ -425,7 +425,8 @@ dpdk_test = executable('dpdk-test',
+@@ -393,7 +393,8 @@ dpdk_test = executable('dpdk-test',
  	link_whole: link_libs,
  	dependencies: test_dep_objs,
- 	c_args: cflags,
+ 	c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
 -	install_rpath: driver_install_path,
 +	install_rpath: join_paths(get_option('prefix'),
 +			 driver_install_path),
  	install: true)
  
- has_hugepage = run_command('has-hugepage.sh').stdout().strip() != '0'
+ # some perf tests (eg: memcpy perf autotest)take very long
 -- 
 2.20.1