From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id E97C8A04AC;
Tue, 1 Sep 2020 17:58:50 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 8CF431C0B2;
Tue, 1 Sep 2020 17:58:50 +0200 (CEST)
Received: from youngberry.canonical.com (youngberry.canonical.com
[91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 9F82C1C0B1
for <dev@dpdk.org>; Tue, 1 Sep 2020 17:58:49 +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 <christian.ehrhardt@canonical.com>)
id 1kD8gL-00083y-DK; Tue, 01 Sep 2020 15:58:49 +0000
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
To: dev <dev@dpdk.org>
Cc: Luca Boccassi <bluca@debian.org>,
Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Tue, 1 Sep 2020 17:58:47 +0200
Message-Id: <20200901155847.3528114-1-christian.ehrhardt@canonical.com>
X-Mailer: git-send-email 2.28.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [RFC] 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
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 <christian.ehrhardt@canonical.com>
---
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..de6e03ca65 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_libnuma == 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..d4a128d67e 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_libnuma == 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')
--
2.28.0