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 3B0A7A0518 for ; Fri, 24 Jul 2020 14:12:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 32F491C2F2; Fri, 24 Jul 2020 14:12:39 +0200 (CEST) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by dpdk.org (Postfix) with ESMTP id 1C6CB1C012 for ; Fri, 24 Jul 2020 14:12:37 +0200 (CEST) Received: by mail-wm1-f67.google.com with SMTP id o8so7763140wmh.4 for ; Fri, 24 Jul 2020 05:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GUGJCKrwQ9bPGw0yJW9qYe30Q6ACWchuxD3+5LArjrk=; b=l/oG1O4VOPyCLQSxhpN3zwIBcX8JN2YN4PjKrdsaje07EqbrsklruI17CO9hvxfkz/ dN3foMmo0xBbmwTkXQr0mE2oKrgn+cqGwEDWq4/Huu7lOhv07d7lQ2bjHORzVURVjT70 I3uqRBRo3yHz7wSxDlebpbGU2SBhRDTJQJm1jKj17lVFCscJ+2Uak79GR5PU5K4J6gEK kzc45D88IEzLzQ8bm3/0J8mey90/4Lwh3zBVIXgECfFN1ChuktoKLxWkQNPkXq1dwiI7 wGnUwr32j2ikKGTJIsH+Kj9+y2UucLdltwUt6jGHPdjb04ndf7U44fFZQz4hSr4AZ1TX GFBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GUGJCKrwQ9bPGw0yJW9qYe30Q6ACWchuxD3+5LArjrk=; b=J4sxdksdC8vMsR4c98S/lGqnAlYeLqE93ktojRlZGVxSCAuyKIn2/nxDbRhgraClYp hI32XdY5hdEVQ8fAZYa5Q75EcJr10IU2GHKfONjI4tM2HH0f7UnYchElYxDHG+HR6vIP wGxGrlv4irJaPjWuTwvC5XQLlVMJPjo+OfHeP4N2YbQazz6EZNoKYs6Re9wtWkxk6FPo xA/UiNrxFg2rppz/Th0VSUR63OISBVjI00DkUEEtoLkLe+tq/KC3Z2M+HZYUQMWHBp3y yQUlPrDfusonbOIIL1fi8Vc2TmIjOsk9Cz6GUCyJeNt1FEfolX/RkQPXbB48KYyvEhjp F8Cw== X-Gm-Message-State: AOAM530Pvz4BhxBslQ7AKKOTKR/McG5R2Wb6m/Y1oiCigUIWOaPeo7Yj i97nf5LaAeA5JGL+CGjhRvM= X-Google-Smtp-Source: ABdhPJwkIEqjXEjFbhOKFWucHcjYAVSNC61LzFJgmmoz01e427y1733DOBbhUwMefwqtXTMPFeen5g== X-Received: by 2002:a1c:7e44:: with SMTP id z65mr1634333wmc.13.1595592756813; Fri, 24 Jul 2020 05:12:36 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 88sm1266005wrk.43.2020.07.24.05.12.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:12:36 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Luca Boccassi , Sunil Pai G , dpdk stable Date: Fri, 24 Jul 2020 13:00:27 +0100 Message-Id: <20200724120030.1863487-189-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'build/pkg-config: move pkg-config file creation' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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" Hi, FYI, your patch has been queued to stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 59b108d824c3ef94bfd0f6f5b36d9887024d1830 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 30 Jun 2020 15:14:30 +0100 Subject: [PATCH] build/pkg-config: move pkg-config file creation [ backported from upstream commit 11a47f9f1cee9ddc99e6ed4d74b8657f4a951c4e ] Ahead of changes to rework the file, move the pkg-config file generation to a new directory under buildtools. This allows the meson code to be separated out from the main meson.build for simplicity, and also allows any additional scripts for working with the pkg-config files to be placed there too. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi Acked-by: Sunil Pai G --- MAINTAINERS | 2 ++ buildtools/pkg-config/meson.build | 26 ++++++++++++++++++++++++++ meson.build | 25 ++----------------------- 3 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 buildtools/pkg-config/meson.build diff --git a/MAINTAINERS b/MAINTAINERS index c9b7dfaca..418f0f41f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -131,6 +131,8 @@ F: config/rte_config.h F: buildtools/call-sphinx-build.py F: buildtools/gen-pmdinfo-cfile.sh F: buildtools/map_to_def.py +F: buildtools/list-dir-globs.py +F: buildtools/pkg-config/ F: buildtools/symlink-drivers-solibs.sh Public CI diff --git a/buildtools/pkg-config/meson.build b/buildtools/pkg-config/meson.build new file mode 100644 index 000000000..85d59972d --- /dev/null +++ b/buildtools/pkg-config/meson.build @@ -0,0 +1,26 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2020 Intel Corporation + +# for static builds, include the drivers as libs and we need to "whole-archive" +# them. +dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] + +pkg = import('pkgconfig') +pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args +if is_freebsd + pkg_extra_cflags += ['-D__BSD_VISIBLE'] +endif +pkg.generate(name: meson.project_name(), + filebase: 'lib' + meson.project_name().to_lower(), + version: meson.project_version(), + libraries: dpdk_libraries, + libraries_private: dpdk_drivers + dpdk_static_libraries + + ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, + requires: libbsd, # apps using rte_string_fns.h may need this if enabled + # if libbsd is not enabled, then this is blank + description: '''The Data Plane Development Kit (DPDK). +Note that CFLAGS might contain an -march flag higher than typical baseline. +This is required for a number of static inline functions in the public headers.''', + subdirs: [get_option('include_subdir_arch'), '.'], + extra_cflags: pkg_extra_cflags +) diff --git a/meson.build b/meson.build index b7ae9c8d9..41b1beb98 100644 --- a/meson.build +++ b/meson.build @@ -61,29 +61,8 @@ configure_file(output: build_cfg, install_dir: join_paths(get_option('includedir'), get_option('include_subdir_arch'))) -# for static builds, include the drivers as libs and we need to "whole-archive" -# them. -dpdk_drivers = ['-Wl,--whole-archive'] + dpdk_drivers + ['-Wl,--no-whole-archive'] - -pkg = import('pkgconfig') -pkg_extra_cflags = ['-include', 'rte_config.h'] + machine_args -if is_freebsd - pkg_extra_cflags += ['-D__BSD_VISIBLE'] -endif -pkg.generate(name: meson.project_name(), - filebase: 'lib' + meson.project_name().to_lower(), - version: meson.project_version(), - libraries: dpdk_libraries, - libraries_private: dpdk_drivers + dpdk_static_libraries + - ['-Wl,-Bdynamic'] + dpdk_extra_ldflags, - requires: libbsd, # apps using rte_string_fns.h may need this if enabled - # if libbsd is not enabled, then this is blank - description: '''The Data Plane Development Kit (DPDK). -Note that CFLAGS might contain an -march flag higher than typical baseline. -This is required for a number of static inline functions in the public headers.''', - subdirs: [get_option('include_subdir_arch'), '.'], - extra_cflags: pkg_extra_cflags -) +# build pkg-config files for dpdk +subdir('buildtools/pkg-config') # final output, list all the libs and drivers to be built # this does not affect any part of the build, for information only. -- 2.20.1