[dpdk-stable] patch 'raw/ifpga/base: fix linking with librt' has been queued to stable release 20.11.4

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk

This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/a7bb99fc8602421e9ba3d527d2640b4e8ed25776

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From a7bb99fc8602421e9ba3d527d2640b4e8ed25776 Mon Sep 17 00:00:00 2001
From: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin at intel.com>
Date: Tue, 28 Sep 2021 12:36:10 +0800
Subject: [PATCH] raw/ifpga/base: fix linking with librt
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 829c5946b55f569e56df399b94ab51c473f6696e ]

Finding with "librt" keyword would give the output with
full path of librt such as
/usr/lib/gcc/x86_64-linux-gnu/7/../../../x86_64-linux-gnu/librt.so
instead of -lrt in libdpdk.pc pkg-config file.

Assume find_library() will prepend "lib", thus remove
"lib" from "librt" keyword. The output will shows
as -lrt.

This will cause an issue when compile DPDK app with
static library as the path of librt has been hard-coded
in the libdpdk.pc file.

Fixes: e41856b515ce ("raw/ifpga/base: enhance driver reliability in multi-process")

Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin at intel.com>
Acked-by: Tianfei Zhang <tianfei.zhang at intel.com>
Acked-by: Bruce Richardson <bruce.richardson at intel.com>
---
 drivers/raw/ifpga/base/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index da2d6e33ca..949f7f1271 100644
--- a/drivers/raw/ifpga/base/meson.build
+++ b/drivers/raw/ifpga/base/meson.build
@@ -25,7 +25,7 @@ sources = [
 
 rtdep = dependency('librt', required: false)
 if not rtdep.found()
-	rtdep = cc.find_library('librt', required: false)
+	rtdep = cc.find_library('rt', required: false)
 endif
 if not rtdep.found()
 	build = false
-- 
2.33.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2021-11-10 14:17:06.618084008 +0800
+++ 0104-raw-ifpga-base-fix-linking-with-librt.patch	2021-11-10 14:17:01.864079479 +0800
@@ -1 +1 @@
-From 829c5946b55f569e56df399b94ab51c473f6696e Mon Sep 17 00:00:00 2001
+From a7bb99fc8602421e9ba3d527d2640b4e8ed25776 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 829c5946b55f569e56df399b94ab51c473f6696e ]
@@ -20 +22,0 @@
-Cc: stable at dpdk.org
@@ -30 +32 @@
-index db602cee69..2de8e7ea22 100644
+index da2d6e33ca..949f7f1271 100644
@@ -33 +35 @@
-@@ -27,7 +27,7 @@ sources = [
+@@ -25,7 +25,7 @@ sources = [
@@ -37,2 +39,2 @@
--    rtdep = cc.find_library('librt', required: false)
-+    rtdep = cc.find_library('rt', required: false)
+-	rtdep = cc.find_library('librt', required: false)
++	rtdep = cc.find_library('rt', required: false)
@@ -41 +43 @@
-     build = false
+ 	build = false