From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 53FC6A0524 for ; Thu, 4 Feb 2021 15:39:14 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2EC6E2405BD; Thu, 4 Feb 2021 15:39:14 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 2C1AF2405BB for ; Thu, 4 Feb 2021 15:39:11 +0100 (CET) IronPort-SDR: lLmlMULJe2nQGcTxYMiqwwMc5oK042AikkiBgWPMicKi+BQDy/prlmaMtUF1DgjjzIlW+9lXrY DdS7mz7+03/w== X-IronPort-AV: E=McAfee;i="6000,8403,9884"; a="178687889" X-IronPort-AV: E=Sophos;i="5.79,401,1602572400"; d="scan'208";a="178687889" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Feb 2021 06:39:11 -0800 IronPort-SDR: iMWnnaxbAwHbt7HY4d6jlq6bHFym2SSCMAP5VE69taYyk5e0AVehvpygLuhOA08vdm4n+N1Voi huhlTX++yklA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,401,1602572400"; d="scan'208";a="407226944" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga004.fm.intel.com with ESMTP; 04 Feb 2021 06:39:08 -0800 From: Bruce Richardson To: stable@dpdk.org Cc: Bruce Richardson , Ruifeng Wang , Liron Himi , Lee Daly , Hemant Agrawal , Martin Spinler Date: Thu, 4 Feb 2021 14:38:52 +0000 Message-Id: <20210204143852.327947-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 19.11] build: force pkg-config for dependency detection X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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. Signed-off-by: Bruce Richardson Tested-by: Ruifeng Wang Tested-by: Liron Himi Tested-by: Lee Daly Tested-by: Hemant Agrawal Tested-by: Martin Spinler --- Cherry-pick and fixup of commit 7be7dc6dea from mainline. --- app/test/meson.build | 2 +- config/meson.build | 2 +- drivers/compress/isal/meson.build | 2 +- drivers/compress/zlib/meson.build | 2 +- drivers/crypto/ccp/meson.build | 2 +- drivers/crypto/openssl/meson.build | 2 +- drivers/crypto/qat/meson.build | 2 +- drivers/net/af_xdp/meson.build | 2 +- drivers/net/bnx2x/meson.build | 2 +- drivers/net/mlx4/meson.build | 3 ++- drivers/net/mlx5/meson.build | 3 ++- drivers/net/nfb/meson.build | 2 +- drivers/net/szedata2/meson.build | 2 +- examples/vm_power_manager/meson.build | 2 +- lib/librte_bpf/meson.build | 2 +- lib/librte_telemetry/meson.build | 2 +- 16 files changed, 18 insertions(+), 16 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 1fa9124c7e..df94b4d48f 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -369,7 +369,7 @@ cflags += ['-DALLOW_INTERNAL_API'] test_dep_objs = [] if dpdk_conf.has('RTE_LIBRTE_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 bab00f1489..490aaaad08 100644 --- a/config/meson.build +++ b/config/meson.build @@ -156,7 +156,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/compress/isal/meson.build b/drivers/compress/isal/meson.build index 25578880db..b039dfdfc5 100644 --- 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 b1328c535e..3bb7769494 100644 --- 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/ccp/meson.build b/drivers/crypto/ccp/meson.build index 6f7217adbf..99c7684e50 100644 --- 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/openssl/meson.build b/drivers/crypto/openssl/meson.build index 394e74c9eb..cd05f1dbaf 100644 --- 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 fc65923a76..8d1e25a845 100644 --- 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' if dep.found() diff --git a/drivers/net/af_xdp/meson.build b/drivers/net/af_xdp/meson.build index 307aa0e388..a9007439fe 100644 --- a/drivers/net/af_xdp/meson.build +++ b/drivers/net/af_xdp/meson.build @@ -3,7 +3,7 @@ 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 diff --git a/drivers/net/bnx2x/meson.build b/drivers/net/bnx2x/meson.build index 678708905e..f9749d3132 100644 --- 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 = 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 ff7386aee2..a03ab930cc 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -25,7 +25,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/mlx5/meson.build b/drivers/net/mlx5/meson.build index a5775d18e3..139056cbe8 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -25,7 +25,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/net/nfb/meson.build b/drivers/net/nfb/meson.build index d53e8eca7d..995c44c61c 100644 --- a/drivers/net/nfb/meson.build +++ b/drivers/net/nfb/meson.build @@ -3,7 +3,7 @@ # Copyright(c) 2019 Netcope Technologies, a.s. # All rights reserved. -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 b53fcbc591..77a5b0ed80 100644 --- a/drivers/net/szedata2/meson.build +++ b/drivers/net/szedata2/meson.build @@ -1,7 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -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 20a4a05b3b..8dd5bd2eb6 100644 --- a/examples/vm_power_manager/meson.build +++ b/examples/vm_power_manager/meson.build @@ -40,7 +40,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 52cfaf9ac2..76e00e9fd4 100644 --- a/lib/librte_bpf/meson.build +++ b/lib/librte_bpf/meson.build @@ -20,7 +20,7 @@ install_headers('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_telemetry/meson.build b/lib/librte_telemetry/meson.build index 26a331140b..f65f1f4acf 100644 --- 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 = dependency('jansson', required: false) +jansson = dependency('jansson', required: false, method: 'pkg-config') if jansson.found() ext_deps += jansson dpdk_app_link_libraries += ['telemetry'] -- 2.27.0