[v2] ifpga/base/meson: fix looking for librt

Message ID 20210722081603.42711-1-mohamad.noor.alim.hussin@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Ferruh Yigit
Headers
Series [v2] ifpga/base/meson: fix looking for librt |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/iol-testing warning apply patch failure
ci/Intel-compilation warning apply issues

Commit Message

mohamad.noor.alim.hussin@intel.com July 22, 2021, 8:16 a.m. UTC
  From: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com>

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")
Cc: tianfei.zhang@intel.com
Cc: stable@dpdk.org

Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com>
---
 drivers/raw/ifpga/base/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Ferruh Yigit Aug. 30, 2021, 9:29 a.m. UTC | #1
On 7/22/2021 9:16 AM, mohamad.noor.alim.hussin@intel.com wrote:
> From: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com>
> 
> 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")
> Cc: tianfei.zhang@intel.com
> Cc: stable@dpdk.org
> 
> Signed-off-by: Mohamad Noor Alim Hussin <mohamad.noor.alim.hussin@intel.com>

This patch is resent, because original patch was not in the patchwork as David
reminded.

But first patch already has acks, I am moving them here:

Acked-by: Tianfei Zhang <tianfei.zhang@intel.com>
(converted email address to all lowercase)

Acked-by: Bruce Richardson <bruce.richardson@intel.com>

Also I can produce the same, and patch looks good to me.


But it fails to apply clearly because of the white-space differences, and this
prevents CI running.

@Mohamad, can you please send a new version rebasing on top of latest code?
Please keep the acks above in the next version commit log, since the change will
be only white-space.

Thanks,
ferruh
  

Patch

diff --git a/drivers/raw/ifpga/base/meson.build b/drivers/raw/ifpga/base/meson.build
index da2d6e33c..949f7f127 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