build: force pkg-config for dependency detection

Meson can use cmake as a fallback for detecting packages, and this can
lead to picking up 64-libs for 32-bit builds. To work around this, force
the use of pkg-config only for detecting libcrypto, zlib, jansson and
other package dependencies.

Cc: stable@dpdk.org
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Ruifeng Wang <ruifeng.wang@arm.com>
Tested-by: Liron Himi <lironh@marvell.com>
Tested-by: Lee Daly <lee.daly@intel.com>
Tested-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Tested-by: Martin Spinler <spinler@cesnet.cz>

diff --git a/app/test/meson.build b/app/test/meson.build
index 0889ad4c236739e93ba5e2199d0aae7ecd009799..561e493a2944dacc684136fae67479462b2d7480 100644 (file)
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -408,7 +408,7 @@ cflags += ['-DALLOW_INTERNAL_API']
 
 test_dep_objs = []
 if dpdk_conf.has('RTE_LIB_COMPRESSDEV')
-       compress_test_dep = dependency('zlib', required: false)
+       compress_test_dep = dependency('zlib', required: false, method: 'pkg-config')
        if compress_test_dep.found()
                test_dep_objs += compress_test_dep
                test_sources += 'test_compressdev.c'

diff --git a/config/meson.build b/config/meson.build
index 9abb30c39fa7c11b8efaf72f127680ce23b97efa..3cf560b8a3f5a9832b5012e9778e86443ff4ec31 100644 (file)
--- a/config/meson.build
+++ b/config/meson.build
@@ -167,7 +167,7 @@ if fdt_dep.found() and cc.has_header('fdt.h')
 endif
 
 # check for libbsd
-libbsd = dependency('libbsd', required: false)
+libbsd = dependency('libbsd', required: false, method: 'pkg-config')
 if libbsd.found()
        dpdk_conf.set('RTE_USE_LIBBSD', 1)
 endif

diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build
index 580419e6d979eea8a24927828503e261d79340ce..220de35420b20b740d34fa3f18ca5c3d938d6d89 100644 (file)
--- a/drivers/common/mlx5/linux/meson.build
+++ b/drivers/common/mlx5/linux/meson.build
@@ -19,7 +19,8 @@ endif
 libnames = [ 'mlx5', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-       lib = dependency('lib' + libname, static:static_ibverbs, required:false)
+       lib = dependency('lib' + libname, static:static_ibverbs,
+                       required:false, method: 'pkg-config')
        if not lib.found() and not static_ibverbs
                lib = cc.find_library(libname, required:false)
        endif

diff --git a/drivers/common/mvep/meson.build b/drivers/common/mvep/meson.build
index 863a20ab90daa7363b7e50f670e4c4372e97f51b..7cd968b3821e93bf4c60ce00278391d351b3e84e 100644 (file)
--- a/drivers/common/mvep/meson.build
+++ b/drivers/common/mvep/meson.build
@@ -4,7 +4,7 @@
 # All rights reserved.
 #
 
-dep = dependency('libmusdk', required: false)
+dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libmusdk"'

diff --git a/drivers/common/qat/meson.build b/drivers/common/qat/meson.build
index 7dd80cc53f2c26eb4308e0991c55cdec1e724176..67f7aca974bcf4387cef85afd440f805fdbeabb1 100644 (file)
--- a/drivers/common/qat/meson.build
+++ b/drivers/common/qat/meson.build
@@ -21,7 +21,7 @@ if disabled_drivers.contains(qat_compress_path)
                        'Explicitly disabled via build config')
 endif
 
-libcrypto = dependency('libcrypto', required: false)
+libcrypto = dependency('libcrypto', required: false, method: 'pkg-config')
 if qat_crypto and not libcrypto.found()
        qat_crypto = false
        dpdk_drvs_disabled += qat_crypto_path

diff --git a/drivers/compress/isal/meson.build b/drivers/compress/isal/meson.build
index 5ee17e28f590ee7f4c72b7454debcbf879e23604..d847c2ea6f022f28297c32c9bb34c1de6fb3b6ea 100644 (file)
--- a/drivers/compress/isal/meson.build
+++ b/drivers/compress/isal/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright 2018 Intel Corporation
 
-dep = dependency('libisal', required: false)
+dep = dependency('libisal', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libisal"'

diff --git a/drivers/compress/zlib/meson.build b/drivers/compress/zlib/meson.build
index b19a6d2b161fef18fde9eff3f16a723fb2aa760d..82cf0dddd6496b0de53ecb0a0e9cb1f86c9545ac 100644 (file)
--- a/drivers/compress/zlib/meson.build
+++ b/drivers/compress/zlib/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2018 Cavium Networks
 
-dep = dependency('zlib', required: false)
+dep = dependency('zlib', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "zlib"'

diff --git a/drivers/crypto/armv8/meson.build b/drivers/crypto/armv8/meson.build
index 3289a2adcac5f983a014e3ea8c28004f6f3188d9..027173bc1ec9b253ec3aab3949d6fcc4d2a6769e 100644 (file)
--- a/drivers/crypto/armv8/meson.build
+++ b/drivers/crypto/armv8/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2019 Arm Limited
 
-dep = dependency('libAArch64crypto', required: false)
+dep = dependency('libAArch64crypto', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libAArch64crypto"'

diff --git a/drivers/crypto/ccp/meson.build b/drivers/crypto/ccp/meson.build
index a0e0b379eb31f4e27ceed24f5fa7272177539e08..ff66427ae88a6193a6228db91554d26b99225f55 100644 (file)
--- a/drivers/crypto/ccp/meson.build
+++ b/drivers/crypto/ccp/meson.build
@@ -5,7 +5,7 @@ if not is_linux
        build = false
        reason = 'only supported on Linux'
 endif
-dep = dependency('libcrypto', required: false)
+dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libcrypto"'

diff --git a/drivers/crypto/mvsam/meson.build b/drivers/crypto/mvsam/meson.build
index 384eacff0343755ffc06e0708197914766c58121..b4c55b5ff5655a724ee778942d9cb09acec1e6f3 100644 (file)
--- a/drivers/crypto/mvsam/meson.build
+++ b/drivers/crypto/mvsam/meson.build
@@ -3,7 +3,7 @@
 # Copyright(c) 2018 Semihalf.
 # All rights reserved.
 
-dep = dependency('libmusdk', required: false)
+dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libmusdk"'

diff --git a/drivers/crypto/openssl/meson.build b/drivers/crypto/openssl/meson.build
index d9ac6989712519931d3a47f99e45392abac413ea..47fb2bb7510c5034836c55d77fae8712e4451b58 100644 (file)
--- a/drivers/crypto/openssl/meson.build
+++ b/drivers/crypto/openssl/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: BSD-3-Clause
 # Copyright(c) 2017 Intel Corporation
 
-dep = dependency('libcrypto', required: false)
+dep = dependency('libcrypto', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libcrypto"'

diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build
index bc90ec44ccd53b3ace97e79334401673a214f892..92e0ed65651a9e8da03056a253d3da24af726710 100644 (file)
--- a/drivers/crypto/qat/meson.build
+++ b/drivers/crypto/qat/meson.build
@@ -5,7 +5,7 @@
 # driver which comes later. Here we just add our sources files to the list
 build = false
 reason = '' # sentinal value to suppress printout
-dep = dependency('libcrypto', required: false)
+dep = dependency('libcrypto', required: false, method: 'pkg-config')
 qat_includes += include_directories('.')
 qat_deps += 'cryptodev'
 qat_deps += 'net'

diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build
index dce1230365b9dc50e7fceeda2c15abdc50e1a70f..60ccffabb9443900b6d95381a1f2e1a812165fae 100644 (file)
--- a/drivers/net/af_xdp/meson.build
+++ b/drivers/net/af_xdp/meson.build
@@ -9,14 +9,15 @@ endif
 
 sources = files('rte_eth_af_xdp.c')
 
-bpf_dep = dependency('libbpf', required: false)
+bpf_dep = dependency('libbpf', required: false, method: 'pkg-config')
 if not bpf_dep.found()
        bpf_dep = cc.find_library('bpf', required: false)
 endif
 
 if bpf_dep.found() and cc.has_header('bpf/xsk.h') and cc.has_header('linux/if_xdp.h')
        ext_deps += bpf_dep
-       bpf_ver_dep = dependency('libbpf', version : '>=0.2.0', required: false)
+       bpf_ver_dep = dependency('libbpf', version : '>=0.2.0',
+                       required: false, method: 'pkg-config')
        if bpf_ver_dep.found()
                dpdk_conf.set('RTE_LIBRTE_AF_XDP_PMD_SHARED_UMEM', 1)
        endif

diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build
index 8837ef4247601e372e3c4a9df7039d82b8b09a99..e260b75926ec472a96962a6cbc78f75c320a5f54 100644 (file)
--- a/drivers/net/bnx2x/meson.build
+++ b/drivers/net/bnx2x/meson.build
@@ -7,7 +7,7 @@ if is_windows
        subdir_done()
 endif
 
-dep = dependency('zlib', required: false)
+dep = dependency('zlib', required: false, method: 'pkg-config')
 build = dep.found()
 reason = 'missing dependency, "zlib"'
 ext_deps += dep

diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build
index 0cf9938a88bbc0accefac19fab39c118c4b7eb0f..d7602b748e130519834dd55f070d559549495dd9 100644 (file)
--- a/drivers/net/mlx4/meson.build
+++ b/drivers/net/mlx4/meson.build
@@ -24,7 +24,8 @@ endif
 libnames = [ 'mlx4', 'ibverbs' ]
 libs = []
 foreach libname:libnames
-       lib = dependency('lib' + libname, static:static_ibverbs, required:false)
+       lib = dependency('lib' + libname, static:static_ibverbs,
+                       required:false, method: 'pkg-config')
        if not lib.found() and not static_ibverbs
                lib = cc.find_library(libname, required:false)
        endif

diff --git a/drivers/net/mvneta/meson.build b/drivers/net/mvneta/meson.build
index 4e073e0d2d8aa8116df49c8b4aebc46a1a4bb2da..0be7b3d8bab8235214e0a0af410df0342da1f982 100644 (file)
--- a/drivers/net/mvneta/meson.build
+++ b/drivers/net/mvneta/meson.build
@@ -9,7 +9,7 @@ if is_windows
        subdir_done()
 endif
 
-dep = dependency('libmusdk', required: false)
+dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libmusdk"'

diff --git a/drivers/net/mvpp2/meson.build b/drivers/net/mvpp2/meson.build
index c509d89164f31e49fce7f6f029f33dc56f6e0a87..bfda5439ba631e92640b1db4db75f2db0f6f21cb 100644 (file)
--- a/drivers/net/mvpp2/meson.build
+++ b/drivers/net/mvpp2/meson.build
@@ -9,7 +9,7 @@ if is_windows
        subdir_done()
 endif
 
-dep = dependency('libmusdk', required: false)
+dep = dependency('libmusdk', required: false, method: 'pkg-config')
 if not dep.found()
        build = false
        reason = 'missing dependency, "libmusdk"'

diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build
index 42f7921dceb2993c4d9f6793392dc477d6bf5bd9..f4a89b87d53ec97153d03f0a9302c9bb8754cd66 100644 (file)
--- a/drivers/net/nfb/meson.build
+++ b/drivers/net/nfb/meson.build
@@ -9,7 +9,7 @@ if is_windows
        subdir_done()
 endif
 
-dep = dependency('netcope-common', required: false)
+dep = dependency('netcope-common', required: false, method: 'pkg-config')
 reason = 'missing dependency, "libnfb"'
 build = dep.found()
 ext_deps += dep

diff --git a/drivers/net/szedata2/meson.build b/drivers/net/szedata2/meson.build
index 4c02830b044025e1dcc3c13c6393723bc6cd0fd0..4f8f3325f6b64588b3cd334f9ae709be22153d4d 100644 (file)
--- a/drivers/net/szedata2/meson.build
+++ b/drivers/net/szedata2/meson.build
@@ -7,7 +7,7 @@ if is_windows
        subdir_done()
 endif
 
-dep = dependency('libsze2', required: false)
+dep = dependency('libsze2', required: false, method: 'pkg-config')
 build = dep.found()
 reason = 'missing dependency, "libsze2"'
 ext_deps += dep

diff --git a/examples/vm_power_manager/meson.build b/examples/vm_power_manager/meson.build
index 1f813fbe8766b1a263ad2330e8ce7761bdf00a8e..637bd2323581fc9babf72159f82bdc07ccf31ed7 100644 (file)
--- a/examples/vm_power_manager/meson.build
+++ b/examples/vm_power_manager/meson.build
@@ -41,7 +41,7 @@ opt_dep = cc.find_library('virt', required : false)
 build = opt_dep.found()
 ext_deps += opt_dep
 
-opt_dep = dependency('jansson', required : false)
+opt_dep = dependency('jansson', required : false, method: 'pkg-config')
 if opt_dep.found()
        ext_deps += opt_dep
        cflags += '-DUSE_JANSSON'

diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 48460e9505025b68cdb595ebbdfe0d73a393b6bb..614277effdeb4bb418220d2f8ab78c8648a3204f 100644 (file)
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -19,7 +19,7 @@ headers = files('bpf_def.h',
 
 deps += ['mbuf', 'net', 'ethdev']
 
-dep = dependency('libelf', required: false)
+dep = dependency('libelf', required: false, method: 'pkg-config')
 if dep.found()
        dpdk_conf.set('RTE_LIBRTE_BPF_ELF', 1)
        sources += files('bpf_load_elf.c')

diff --git a/lib/librte_metrics/meson.build b/lib/librte_metrics/meson.build
index eed27b880aafedc604fb99a86a2ff7f12bc6026c..28a8cc11558fc531fa647d324da1103e882e8113 100644 (file)
--- a/lib/librte_metrics/meson.build
+++ b/lib/librte_metrics/meson.build
@@ -4,7 +4,7 @@
 sources = files('rte_metrics.c')
 headers = files('rte_metrics.h')
 
-jansson = dependency('jansson', required: false)
+jansson = dependency('jansson', required: false, method: 'pkg-config')
 if jansson.found()
        ext_deps += jansson
        sources += files('rte_metrics_telemetry.c')