From patchwork Wed Sep 2 11:10:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Ehrhardt X-Patchwork-Id: 76326 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0A15DA04BC; Wed, 2 Sep 2020 13:10:35 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DAE331C0AD; Wed, 2 Sep 2020 13:10:34 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id A078B1C0AC for ; Wed, 2 Sep 2020 13:10:33 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kDQeu-0000il-W9; Wed, 02 Sep 2020 11:10:33 +0000 From: Christian Ehrhardt To: dev , Bruce Richardson , Thomas Monjalon Cc: Luca Boccassi , Christian Ehrhardt Date: Wed, 2 Sep 2020 13:10:30 +0200 Message-Id: <20200902111030.731593-1-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH] avoid libfdt checks adding full paths to pkg-config X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The checks for libfdt try dependency() first which would only work if a pkg-config would be present but libfdt has none. Then it probes for the lib path itself via cc.find_library. But later it adds the result of either probe to ext_deps which ends up in build and also the resulting pkg-config to contain toolchain versioned paths in Libs.private like: /usr/lib/gcc/x86_64-linux-gnu/9/../../../x86_64-linux-gnu/libfdt.so which obviously breaks on toolchain updates. In general libs used multiple times - ipn3ke + ifpga in this case - are checked centrally in config/meson.build so move it there and fix the adding of dependencies to not use the full file path. The result is libfdt in pkg-config now showing up as: Libs.private: -pthread -lm -ldl -lnuma -lfdt -lpcap Signed-off-by: Christian Ehrhardt Reviewed-by: Luca Boccassi Reviewed-by: Bruce Richardson Reviewed-by: Bruce Richardson --- config/meson.build | 9 +++++++++ drivers/net/ipn3ke/meson.build | 6 +----- drivers/raw/ifpga/meson.build | 7 +------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/config/meson.build b/config/meson.build index cff8b33dd2..1c8317e750 100644 --- a/config/meson.build +++ b/config/meson.build @@ -150,6 +150,15 @@ if numa_dep.found() and cc.has_header('numaif.h') dpdk_extra_ldflags += '-lnuma' endif +has_libfdt = 0 +fdt_dep = cc.find_library('libfdt', required: false) +if fdt_dep.found() and cc.has_header('fdt.h') + dpdk_conf.set10('RTE_HAS_LIBFDT', true) + has_libfdt = 1 + add_project_link_arguments('-lfdt', language: 'c') + dpdk_extra_ldflags += '-lfdt' +endif + # check for libbsd libbsd = dependency('libbsd', required: false) if libbsd.found() diff --git a/drivers/net/ipn3ke/meson.build b/drivers/net/ipn3ke/meson.build index ec9cb7daf0..d5000d807c 100644 --- a/drivers/net/ipn3ke/meson.build +++ b/drivers/net/ipn3ke/meson.build @@ -9,11 +9,7 @@ # rte_eth_switch_domain_free() # -dep = dependency('libfdt', required: false) -if not dep.found() - dep = cc.find_library('libfdt', required: false) -endif -if not dep.found() +if has_libfdt == 0 build = false reason = 'missing dependency, "libfdt"' subdir_done() diff --git a/drivers/raw/ifpga/meson.build b/drivers/raw/ifpga/meson.build index 05a1711b5d..da454b1942 100644 --- a/drivers/raw/ifpga/meson.build +++ b/drivers/raw/ifpga/meson.build @@ -1,11 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2018 Intel Corporation -dep = dependency('libfdt', required: false) -if not dep.found() - dep = cc.find_library('libfdt', required: false) -endif -if not dep.found() +if has_libfdt == 0 build = false reason = 'missing dependency, "libfdt"' subdir_done() @@ -16,7 +12,6 @@ objs = [base_objs] deps += ['ethdev', 'rawdev', 'pci', 'bus_pci', 'kvargs', 'bus_vdev', 'bus_ifpga', 'net', 'pmd_i40e', 'pmd_ipn3ke'] -ext_deps += dep sources = files('ifpga_rawdev.c')