From patchwork Wed Jun 5 20:22:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 54441 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A97EB1B9B0; Wed, 5 Jun 2019 22:23:07 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id E2C901B9B0 for ; Wed, 5 Jun 2019 22:23:05 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Jun 2019 13:23:05 -0700 X-ExtLoop1: 1 Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.223.2]) by orsmga008.jf.intel.com with ESMTP; 05 Jun 2019 13:23:03 -0700 From: Bruce Richardson To: bluca@debian.org, thomas@monjalon.net Cc: dev@dpdk.org, john.mcnamara@intel.com, Bruce Richardson Date: Wed, 5 Jun 2019 21:22:39 +0100 Message-Id: <20190605202248.394-2-bruce.richardson@intel.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190605202248.394-1-bruce.richardson@intel.com> References: <20190605202248.394-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 01/10] build: print list of disabled components for meson build 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" When configuring with meson we print out a list of enabled components, but it is also useful to list out the disabled components and the reasons why. Signed-off-by: Bruce Richardson --- doc/guides/contributing/coding_style.rst | 15 ++++++++++++++- drivers/meson.build | 12 +++++++++++- lib/meson.build | 6 +++++- meson.build | 15 +++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/doc/guides/contributing/coding_style.rst b/doc/guides/contributing/coding_style.rst index a5d5897f3..449b33494 100644 --- a/doc/guides/contributing/coding_style.rst +++ b/doc/guides/contributing/coding_style.rst @@ -852,12 +852,15 @@ allow_experimental_apis build **Default Value = true** Used to optionally compile a library, based on its dependencies or - environment. A simple example of use would be: + environment. When set to "false" the ``reason`` value, explained below, should + also be set to explain to the user why the component is not being built. + A simple example of use would be: .. code-block:: python if not is_linux build = false + reason = 'only supported on Linux' endif @@ -938,6 +941,13 @@ objs objects that were compiled up as part of another target given in the included library ``meson.build`` file. +reason + **Default Value = ''**. + This variable should be used when a library is not to be built i.e. when + ``build`` is set to "false", to specify the reason why a library will not be + built. For missing dependencies this should be of the form + ``'missing dependency, "libname"'``. + version **Default Value = 1**. Specifies the ABI version of the library, and is used as the major @@ -991,6 +1001,9 @@ pkgconfig_extra_libs using static libraries. Anything added here will be appended to the end of the ``pkgconfig --libs`` output. +reason + As above. + sources [mandatory] As above diff --git a/drivers/meson.build b/drivers/meson.build index 4c444f495..94e6c829e 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -40,6 +40,7 @@ foreach class:dpdk_driver_classes # set up empty variables used for build build = true # set to false to disable, e.g. missing deps + reason = '' # set if build == false to explain name = drv version = 1 allow_experimental_apis = false @@ -61,7 +62,16 @@ foreach class:dpdk_driver_classes # pull in driver directory which should assign to each of the above subdir(drv_path) - if build + if not build + # some driver directories are placeholders which + # are never built, so we allow suppression of the + # component disable printout in those cases + if reason != '' + dpdk_drvs_disabled += drv_path + set_variable(drv_path.underscorify() + + '_disable_reason', reason) + endif + else class_drivers += name dpdk_conf.set(config_flag_fmt.format(name.to_upper()),1) diff --git a/lib/meson.build b/lib/meson.build index e067ce5ea..76c13b7da 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -46,6 +46,7 @@ default_cflags += '-D_GNU_SOURCE' foreach l:libraries build = true + reason = '' # set if build == false to explain why name = l version = 1 allow_experimental_apis = false @@ -68,7 +69,10 @@ foreach l:libraries dir_name = 'librte_' + l subdir(dir_name) - if build + if not build + dpdk_libs_disabled += name + set_variable(name.underscorify() + '_disable_reason', reason) + else enabled_libs += name dpdk_conf.set('RTE_LIBRTE_' + name.to_upper(), 1) install_headers(headers) diff --git a/meson.build b/meson.build index 9cad43481..63a1ce25b 100644 --- a/meson.build +++ b/meson.build @@ -20,6 +20,8 @@ dpdk_driver_classes = [] dpdk_drivers = [] dpdk_extra_ldflags = [] dpdk_app_link_libraries = [] +dpdk_libs_disabled = [] +dpdk_drvs_disabled = [] # configure the build, and make sure configs here and in config folder are # able to be included in any file. We also store a global array of include dirs @@ -108,3 +110,16 @@ foreach class:dpdk_driver_classes endforeach endforeach message(output_message + '\n') + +output_message = '\n=================\nContent Skipped\n=================\n' +output_message += '\nlibs:\n\t' +foreach lib:dpdk_libs_disabled + reason = get_variable(lib.underscorify() + '_disable_reason') + output_message += lib + ':\t' + reason + '\n\t' +endforeach +output_message += '\ndrivers:\n\t' +foreach drv:dpdk_drvs_disabled + reason = get_variable(drv.underscorify() + '_disable_reason') + output_message += drv + ':\t' + reason + '\n\t' +endforeach +message(output_message + '\n')