From patchwork Fri Sep 18 08:49:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Hawari X-Patchwork-Id: 78077 X-Patchwork-Delegate: thomas@monjalon.net 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 21299A04C8; Fri, 18 Sep 2020 10:49:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 635191D93F; Fri, 18 Sep 2020 10:49:34 +0200 (CEST) Received: from aer-iport-2.cisco.com (aer-iport-2.cisco.com [173.38.203.52]) by dpdk.org (Postfix) with ESMTP id 8E00B1D93E for ; Fri, 18 Sep 2020 10:49:33 +0200 (CEST) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A0DkBACQc2Rf/xbLJq1fhXJVASASLI07pFoLAQEBDQEBGxQEAQGESwKCKiU4EwIDAQELAQEFAQEBAgEGBG2FXAyFcwYyAUYQUVcGE4MmAYJ8txaFU4NJgUKBOIguhRmCAIRfhASGMASaUJxcgVqBF4ERh2WRRw8hgRGDIpxPsnYCBAsCFYFrI4FXMxoIHxE7gmkJRxkNkTKLNj8DMDcCBgoBAQMJjBmCRgEB X-IronPort-AV: E=Sophos;i="5.77,274,1596499200"; d="scan'208";a="29728453" Received: from aer-iport-nat.cisco.com (HELO aer-core-2.cisco.com) ([173.38.203.22]) by aer-iport-2.cisco.com with ESMTP/TLS/DHE-RSA-SEED-SHA; 18 Sep 2020 08:49:30 +0000 Received: from MHAWARI-M-82K5.cisco.com ([10.61.170.176]) (authenticated bits=0) by aer-core-2.cisco.com (8.15.2/8.15.2) with ESMTPSA id 08I8nPlg027565 (version=TLSv1.2 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Sep 2020 08:49:30 GMT From: Mohammed Hawari To: Bruce Richardson Cc: dev@dpdk.org Date: Fri, 18 Sep 2020 10:49:23 +0200 Message-Id: <20200918084924.31784-2-mohammed@hawari.fr> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200918084924.31784-1-mohammed@hawari.fr> References: <20200918084924.31784-1-mohammed@hawari.fr> MIME-Version: 1.0 X-Authenticated-User: mhawari X-Outbound-SMTP-Client: 10.61.170.176, [10.61.170.176] X-Outbound-Node: aer-core-2.cisco.com Subject: [dpdk-dev] [PATCH 1/1] build: allow disabling libs 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" Similarly to the disable_drivers option, the disable_libs option is introduced. This allows to selectively disable the build of elements in libs to speed-up the build process. Signed-off-by: Mohammed Hawari --- app/meson.build | 12 +++++++++++- lib/meson.build | 7 +++++++ meson.build | 9 +++++++++ meson_options.txt | 2 ++ 4 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/meson.build b/app/meson.build index eb74f215a..93affefa3 100644 --- a/app/meson.build +++ b/app/meson.build @@ -42,7 +42,17 @@ foreach app:apps subdir(name) - if build + foreach d:deps + if dpdk_libs_disabled.contains(d) + build = false + reason = 'missing dependency, "@0@" '.format (d) + endif + endforeach + + if not build + dpdk_apps_disabled += name + set_variable(name.underscorify() + '_disable_reason', reason) + else dep_objs = [] foreach d:deps dep_objs += get_variable(get_option('default_library') diff --git a/lib/meson.build b/lib/meson.build index d8b358e5f..c8507fda1 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -45,6 +45,8 @@ if is_windows ] # only supported libraries for windows endif +disabled_libs = get_option('disable_libs').split(',') + default_cflags = machine_args default_cflags += ['-DALLOW_EXPERIMENTAL_API'] default_cflags += ['-DALLOW_INTERNAL_API'] @@ -79,6 +81,11 @@ foreach l:libraries dir_name = 'librte_' + l subdir(dir_name) + if disabled_libs.contains(l) + build = false + reason = 'Explicitly disabled via build config' + endif + if build shared_deps = ext_deps static_deps = ext_deps diff --git a/meson.build b/meson.build index 61d9a4f5f..cf04f0e0e 100644 --- a/meson.build +++ b/meson.build @@ -21,6 +21,7 @@ dpdk_drivers = [] dpdk_extra_ldflags = [] dpdk_libs_disabled = [] dpdk_drvs_disabled = [] +dpdk_apps_disabled = [] abi_version_file = files('ABI_VERSION') if host_machine.cpu_family().startswith('x86') @@ -106,6 +107,14 @@ foreach class:dpdk_driver_classes endforeach message(output_message + '\n') +output_message = '\n===============\nApplications Disabled\n===============\n' +foreach app:dpdk_apps_disabled + reason = get_variable(app.underscorify() + '_disable_reason') + output_message += app + ':\t' + reason + '\n\t' +endforeach + +message(output_message + '\n') + output_message = '\n=================\nContent Skipped\n=================\n' output_message += '\nlibs:\n\t' foreach lib:dpdk_libs_disabled diff --git a/meson_options.txt b/meson_options.txt index 9bf18ab6b..d1aa46b8d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -4,6 +4,8 @@ option('armv8_crypto_dir', type: 'string', value: '', description: 'path to the armv8_crypto library installation directory') option('disable_drivers', type: 'string', value: '', description: 'Comma-separated list of drivers to explicitly disable.') +option('disable_libs', type: 'string', value: '', + description: 'Comma-separated list of libs to explicitly disable.') option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-', description: 'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.') option('enable_docs', type: 'boolean', value: false,