build: improve dependency handling

Whenever possible (if the library ships a pkg-config file) use meson's
dependency() function to look for it, as it will automatically add it
to the Requires.private list if needed, to allow for static builds to
succeed for reverse dependencies of DPDK. Otherwise the recursive
dependencies are not parsed, and users doing static builds have to
resolve them manually by themselves.
When using this API avoid additional checks that are superfluous and
take extra time, and avoid adding the linker flag manually which causes
it to be duplicated.

Signed-off-by: Luca Boccassi <bluca@debian.org>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Bruce Richardson <bruce.richardson@intel.com>

diff --git a/drivers/compress/zlib/meson.build b/drivers/compress/zlib/meson.build
index 7748de2dfb67c696c5175df7a0327c31c5b0b40d..b036703c75d9b907455976b4300e19cf9be2f709 100644 (file)
--- a/drivers/compress/zlib/meson.build
+++ b/drivers/compress/zlib/meson.build
@@ -9,6 +9,5 @@ endif
 deps += 'bus_vdev'
 sources = files('zlib_pmd.c', 'zlib_pmd_ops.c')
 ext_deps += dep
-pkgconfig_extra_libs += '-lz'
 
 allow_experimental_apis = true

diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index e43b00591c5afc5d92d4948bcc342f6406f6619b..915c4c854a6b30a13d873f9e8196894a51a9ac68 100644 (file)
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -18,4 +18,3 @@ sources = files('rte_ccp_pmd.c',
                'ccp_pmd_ops.c')
 
 ext_deps += dep
-pkgconfig_extra_libs += '-lcrypto'

diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index 77a6596d7eb7d402252237f821000c7efea2d277..d56a323663f0544ae4baea44239d8752793368a0 100644 (file)
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -9,4 +9,3 @@ allow_experimental_apis = true
 deps += 'bus_vdev'
 sources = files('rte_openssl_pmd.c', 'rte_openssl_pmd_ops.c')
 ext_deps += dep
-pkgconfig_extra_libs += '-lcrypto'

diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index 9cc98d2c27d40c45cb15ef7f6d88d0b0bd26d810..21f969735bfae6e4dbe6d2526d89bc45e5282241 100644 (file)
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -13,6 +13,5 @@ if dep.found()
                             'qat_sym.c',
                             'qat_sym_session.c')
        qat_ext_deps += dep
-       pkgconfig_extra_libs += '-lcrypto'
        qat_cflags += '-DBUILD_QAT_SYM'
 endif

diff --git a/drivers/meson.build b/drivers/meson.build
index e37d4fe2be993b9b834de5717b20ef9c6fe59046..69d0556d32d1059cd8e13ff2b49158ceb5eb52a9 100644 (file)
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -46,10 +46,11 @@ foreach class:driver_classes
                # set up internal deps. Drivers can append/override as necessary
                deps = std_deps
                # ext_deps: Stores external library dependency got
-               # using dependency() or cc.find_library(). For most cases, we
-               # probably also need to specify the "-l" flags in
-               # pkgconfig_extra_libs variable too, so that it can be reflected
-               # in the pkgconfig output for static builds
+               # using dependency() (preferred) or find_library().
+               # For the find_library() case (but not with dependency()) we also
+               # need to specify the "-l" flags in pkgconfig_extra_libs variable
+               # too, so that it can be reflected in the pkgconfig output for
+               # static builds.
                ext_deps = []
                pkgconfig_extra_libs = []
 

diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
index e3c688869374742fe56410e180dc771457c15ae5..dd189ffc467e16da558b066ea424b800ea24c478 100644 (file)
--- a/drivers/net/bnx2x/meson.build
+++ b/drivers/net/bnx2x/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Intel Corporation
 
-dep = cc.find_library('z', required: false)
+dep = dependency('zlib', required: false)
 build = dep.found()
 ext_deps += dep
 cflags += '-DZLIB_CONST'

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 4bccd68e075139464dcddf26aaa37e2663c80877..b4f9672e737a1a940a5732eeac5d88501ec39902 100644 (file)
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -14,9 +14,9 @@ if pmd_dlopen
        ]
 endif
 libs = [
-       cc.find_library('mnl', required:false),
-       cc.find_library('mlx4', required:false),
-       cc.find_library('ibverbs', required:false),
+       dependency('libmnl', required:false),
+       dependency('libmlx4', required:false),
+       dependency('libibverbs', required:false),
 ]
 build = true
 foreach lib:libs

diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 4540c455b75d063277ae461d84cfdb2796814782..0cf2f0873eb59d565a81a2c2061e2736dee7265d 100644 (file)
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -14,9 +14,9 @@ if pmd_dlopen
        ]
 endif
 libs = [
-       cc.find_library('mnl', required:false),
-       cc.find_library('mlx5', required:false),
-       cc.find_library('ibverbs', required:false),
+       dependency('libmnl', required:false),
+       dependency('libmlx5', required:false),
+       dependency('libibverbs', required:false),
 ]
 build = true
 foreach lib:libs

diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 4fbb29d7c34645bc7e2043e2dc0a26dd515153ca..8a79878ff31f44eecb98383e06248fc4751cf978 100644 (file)
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -18,8 +18,8 @@ install_headers = files('bpf_def.h',
 
 deps += ['mbuf', 'net', 'ethdev']
 
-dep = cc.find_library('elf', required: false)
-if dep.found() == true and cc.has_header('libelf.h', dependencies: dep)
+dep = dependency('libelf', required: false)
+if dep.found()
        sources += files('bpf_load_elf.c')
        ext_deps += dep
 endif

diff --git a/lib/librte_telemetry/meson.build b/lib/librte_telemetry/meson.build
index 9492f544efee032f3d4234dc170a4a5e41e62f48..cafb26f08b13dab140cc45c4902d343526824ed0 100644 (file)
--- a/lib/librte_telemetry/meson.build
+++ b/lib/librte_telemetry/meson.build
@@ -6,7 +6,7 @@ headers = files('rte_telemetry.h', 'rte_telemetry_internal.h', 'rte_telemetry_pa
 deps += ['metrics', 'ethdev']
 cflags += '-DALLOW_EXPERIMENTAL_API'
 
-jansson = cc.find_library('jansson', required: false)
+jansson = dependency('jansson', required: false)
 if jansson.found()
        ext_deps += jansson
        dpdk_app_link_libraries += ['telemetry']