From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A1353A04BC; Wed, 2 Sep 2020 13:10:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 89ED0137D; Wed, 2 Sep 2020 13:10:07 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id D8D6FDE0 for ; Wed, 2 Sep 2020 13:10:05 +0200 (CEST) Received: from mail-ua1-f72.google.com ([209.85.222.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kDQeT-0000Zc-Hd for dev@dpdk.org; Wed, 02 Sep 2020 11:10:05 +0000 Received: by mail-ua1-f72.google.com with SMTP id p13so824030uae.10 for ; Wed, 02 Sep 2020 04:10:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=nd6u59MWrPOHiDFQoxbub30CzcVuc+jU6pQWXmt1zuA=; b=plJUZVkqU09/uWIdwze/PRRHHjzh4DpUwGBI9N5+kIilGzjDh8XYCNEeBn5tXZthTp /vKQ9iduX4dLP4z0tieRwPhiTw+xBuPBdDBpKGs25L172y6So1tWwrNKUZjn071gQOL5 WKww1V+y6eHq7BxGs9eL0xbWKM7sgYqBuq1N9PQvuNS2cXw4Nf+8O7gOJAeF3m302iQi 336ftLWfRYSsK3absa8gNQtgi2RQhQdNxcGxWvuj8Frg3397zxGzIikV9GrCo8JckJaV sbNUTtGcsKpxJutN2iuW/6UPigs0scGInn3k89e2dKhv3oXD6KUYbxqF8I2WlvX1DDx2 iBvw== X-Gm-Message-State: AOAM533OI5MilPm5WtPrdXujuO23TYSLz97zI0Nt6oO2jXtn+aIJ1MjU I8q7BFDrNJ6bEU1GTJS1InHNWMAUSlpHEehiqlEnI8EU9u0IQPx+4LN5nF2S7Em2hopLoM3AESg SxAM4JKVwjJovI35BMHvMptL6k0UI16QjFf7J X-Received: by 2002:ab0:69d6:: with SMTP id u22mr4503163uaq.65.1599045004442; Wed, 02 Sep 2020 04:10:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnRjztqg5zGh91mi81Wmatm0WvdjZJjkKZ5vZrnIexSr3dFwAYyYQ2ju1C48206r0MPVEh9DBZvV+XrGE7agQ= X-Received: by 2002:ab0:69d6:: with SMTP id u22mr4503150uaq.65.1599045004111; Wed, 02 Sep 2020 04:10:04 -0700 (PDT) MIME-Version: 1.0 References: <20200901155847.3528114-1-christian.ehrhardt@canonical.com> <9bf44dac86b43740e608b8592a0696c07cc2afa8.camel@debian.org> In-Reply-To: <9bf44dac86b43740e608b8592a0696c07cc2afa8.camel@debian.org> From: Christian Ehrhardt Date: Wed, 2 Sep 2020 13:09:37 +0200 Message-ID: To: Luca Boccassi Cc: dev Content-Type: text/plain; charset="UTF-8" Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On Tue, Sep 1, 2020 at 6:16 PM Luca Boccassi wrote: > > On Tue, 2020-09-01 at 17:58 +0200, Christian Ehrhardt wrote: > > 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 > > --- > > 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 > > if has_libfdt == 0 ? Same above > > > 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') > > With the above correction, LGTM. > > Reviewed-by: Luca Boccassi Fixed and thanks Luca! CI pipeline (Debian) is happy now. I added your Reviewed-by and added Thomas/Bruce on --to since they last modified these files on various meson cleanups. Will resend the patch as non-RFC with those changes any minute ... > -- > Kind regards, > Luca Boccassi -- Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd