[PATCH] net/mana: support rdma-core via pkg-config in meson

[PATCH] net/mana: support rdma-core via pkg-config in meson

[Shreesh Adiga]

Currently building with custom rdma-core installed in /opt/rdma-core
after setting PKG_CONFIG_PATH=/opt/rdma-core/lib64/pkgconfig/ results
in the below meson logs:
Run-time dependency libmana found: YES 1.0.54.0
Header "infiniband/manadv.h" has symbol "manadv_set_context_attr" : NO

Thus to fix this, the libs is updated in meson.build and is passed to
the cc.has_header_symbol call using dependencies. After this change,
the libmana header files are getting included and net/mana is
successfully enabled.

Fixes: 517ed6e2d590 ("net/mana: add basic driver with build environment")
Cc: longli@microsoft.com
Cc: stable@dpdk.org
Signed-off-by: Shreesh Adiga <16567adigashreesh@gmail.com>
---
 drivers/net/mana/meson.build | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/mana/meson.build b/drivers/net/mana/meson.build
index 2d72eca5a8..3ddc230ab4 100644
--- a/drivers/net/mana/meson.build
+++ b/drivers/net/mana/meson.build
@@ -19,12 +19,14 @@ sources += files(
 )
 
 libnames = ['ibverbs', 'mana']
+libs = []
 foreach libname:libnames
     lib = dependency('lib' + libname, required:false)
     if not lib.found()
         lib = cc.find_library(libname, required:false)
     endif
     if lib.found()
+        libs += lib
         ext_deps += lib
     else
         build = false
@@ -43,7 +45,7 @@ required_symbols = [
 ]
 
 foreach arg:required_symbols
-    if not cc.has_header_symbol(arg[0], arg[1])
+    if not cc.has_header_symbol(arg[0], arg[1], dependencies: libs, args: cflags)
         build = false
         reason = 'missing symbol "' + arg[1] + '" in "' + arg[0] + '"'
         subdir_done()
-- 
2.44.2

RE: [PATCH] net/mana: support rdma-core via pkg-config in meson

[Long Li]

> Subject: [PATCH] net/mana: support rdma-core via pkg-config in meson
> 
> Currently building with custom rdma-core installed in /opt/rdma-core after
> setting PKG_CONFIG_PATH=/opt/rdma-core/lib64/pkgconfig/ results in the below
> meson logs:
> Run-time dependency libmana found: YES 1.0.54.0 Header
> "infiniband/manadv.h" has symbol "manadv_set_context_attr" : NO
> 
> Thus to fix this, the libs is updated in meson.build and is passed to the
> cc.has_header_symbol call using dependencies. After this change, the libmana
> header files are getting included and net/mana is successfully enabled.
> 
> Fixes: 517ed6e2d590 ("net/mana: add basic driver with build environment")
> Cc: longli@microsoft.com
> Cc: stable@dpdk.org
> Signed-off-by: Shreesh Adiga <16567adigashreesh@gmail.com>

Acked-by: Long Li <longli@microsoft.com>

> ---
>  drivers/net/mana/meson.build | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/net/mana/meson.build b/drivers/net/mana/meson.build index
> 2d72eca5a8..3ddc230ab4 100644
> --- a/drivers/net/mana/meson.build
> +++ b/drivers/net/mana/meson.build
> @@ -19,12 +19,14 @@ sources += files(
>  )
> 
>  libnames = ['ibverbs', 'mana']
> +libs = []
>  foreach libname:libnames
>      lib = dependency('lib' + libname, required:false)
>      if not lib.found()
>          lib = cc.find_library(libname, required:false)
>      endif
>      if lib.found()
> +        libs += lib
>          ext_deps += lib
>      else
>          build = false
> @@ -43,7 +45,7 @@ required_symbols = [
>  ]
> 
>  foreach arg:required_symbols
> -    if not cc.has_header_symbol(arg[0], arg[1])
> +    if not cc.has_header_symbol(arg[0], arg[1], dependencies: libs,
> + args: cflags)
>          build = false
>          reason = 'missing symbol "' + arg[1] + '" in "' + arg[0] + '"'
>          subdir_done()
> --
> 2.44.2

Re: [PATCH] net/mana: support rdma-core via pkg-config in meson

[Ferruh Yigit]

On 9/20/2024 6:14 PM, Long Li wrote:
>> Subject: [PATCH] net/mana: support rdma-core via pkg-config in meson
>>
>> Currently building with custom rdma-core installed in /opt/rdma-core after
>> setting PKG_CONFIG_PATH=/opt/rdma-core/lib64/pkgconfig/ results in the below
>> meson logs:
>> Run-time dependency libmana found: YES 1.0.54.0 Header
>> "infiniband/manadv.h" has symbol "manadv_set_context_attr" : NO
>>
>> Thus to fix this, the libs is updated in meson.build and is passed to the
>> cc.has_header_symbol call using dependencies. After this change, the libmana
>> header files are getting included and net/mana is successfully enabled.
>>
>> Fixes: 517ed6e2d590 ("net/mana: add basic driver with build environment")
>> Cc: longli@microsoft.com
>> Cc: stable@dpdk.org
>> Signed-off-by: Shreesh Adiga <16567adigashreesh@gmail.com>
> 
> Acked-by: Long Li <longli@microsoft.com>
> 

Applied to dpdk-next-net/main, thanks.