From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>
Subject: [dpdk-dev] [PATCH 14/14] lib: allow disabling optional libraries
Date: Fri, 16 Apr 2021 18:04:58 +0100 [thread overview]
Message-ID: <20210416170458.50188-15-bruce.richardson@intel.com> (raw)
In-Reply-To: <20210416170458.50188-1-bruce.richardson@intel.com>
Add support for the disable_libs option, to allow disabling the build of
particular libraries. As part of this, maintain a list of what libraries
can safely be disabled, without breaking the build - for now this list is
solely those libraries which are not built on FreeBSD, kni, power and
vhost. This list can be expanded by future patches.
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
lib/meson.build | 24 +++++++++++++++++++++++-
meson_options.txt | 2 ++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/lib/meson.build b/lib/meson.build
index 3a9a6c3be..c9a20f65b 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -81,6 +81,23 @@ if is_windows
] # only supported libraries for windows
endif
+optional_libs = [
+ 'kni',
+ 'power',
+ 'vhost',
+]
+
+disabled_libs = []
+opt_disabled_libs = run_command(list_dir_globs, get_option('disable_libs')).stdout().split()
+foreach l:opt_disabled_libs
+ if not optional_libs.contains(l)
+ warning('Cannot disable mandatory library "@0@"'.format(l))
+ continue
+ endif
+ disabled_libs += l
+endforeach
+
+
default_cflags = machine_args
default_cflags += ['-DALLOW_EXPERIMENTAL_API']
default_cflags += ['-DALLOW_INTERNAL_API']
@@ -114,7 +131,12 @@ foreach l:libraries
deps += ['eal']
endif
- subdir(l)
+ if disabled_libs.contains(l)
+ build = false
+ reason = 'explicitly disabled via build config'
+ else
+ subdir(l)
+ endif
if name != l
warning('Library name, "@0@", and directory name, "@1@", do not match'.format(name, l))
endif
diff --git a/meson_options.txt b/meson_options.txt
index 530fcddfa..9d73fd541 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -6,6 +6,8 @@ option('developer_mode', type: 'feature', description:
'turn on additional build checks relevant for DPDK developers')
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 libraries to explicitly disable. [NOTE: not all libs can be disabled]')
option('drivers_install_subdir', type: 'string', value: 'dpdk/pmds-<VERSION>', description:
'Subdirectory of libdir where to install PMDs. Defaults to using a versioned subdirectory.')
option('enable_docs', type: 'boolean', value: false, description:
--
2.27.0
next prev parent reply other threads:[~2021-04-16 17:07 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 11:49 [dpdk-dev] [RFC PATCH 00/14] Build file update proposals Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 01/14] editorconfig: add entry for meson files Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 02/14] build: simplify library build file Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 03/14] build: correct indentation in list of libs Bruce Richardson
2021-04-01 13:30 ` Thomas Monjalon
2021-04-01 14:01 ` Bruce Richardson
2021-04-01 11:49 ` [dpdk-dev] [RFC PATCH 04/14] build: simplify the driver build configuration file Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 05/14] build: clean up driver list indentation Bruce Richardson
2021-04-01 12:14 ` Andrew Rybchenko
2021-04-01 12:33 ` Bruce Richardson
2021-04-01 12:40 ` Andrew Rybchenko
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 06/14] build: reduce indentation in app build spec Bruce Richardson
2021-04-01 13:32 ` Thomas Monjalon
2021-04-01 14:05 ` Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 07/14] build: reduce indentation in examples " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 08/14] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 09/14] lib: change meson " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 10/14] drivers: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 11/14] examples: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 12/14] app: " Bruce Richardson
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 13/14] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-01 13:42 ` Thomas Monjalon
2021-04-01 11:50 ` [dpdk-dev] [RFC PATCH 14/14] lib: allow disabling optional libraries Bruce Richardson
2021-04-01 12:27 ` [dpdk-dev] [RFC PATCH 00/14] Build file update proposals Andrew Rybchenko
2021-04-01 13:15 ` Luca Boccassi
2021-04-01 13:36 ` Thomas Monjalon
2021-04-01 14:10 ` Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 00/14] Build file updates Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 01/14] build: simplify library build file Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 02/14] build: tidy up list of libraries to build Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 03/14] build: simplify the driver build configuration file Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 04/14] build: clean up driver lists Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 05/14] build: reduce indentation in app build spec Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 06/14] build: reduce indentation in examples " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 07/14] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 08/14] lib: cleanup whitespace in meson build files Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 09/14] drivers: change meson file tabs to spaces Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 10/14] examples: " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 11/14] app: " Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 12/14] editorconfig: add entry for meson files Bruce Richardson
2021-04-16 17:04 ` [dpdk-dev] [PATCH 13/14] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-16 17:04 ` Bruce Richardson [this message]
2021-04-18 8:45 ` [dpdk-dev] [PATCH 00/14] Build file updates Xueming(Steven) Li
2021-04-19 13:06 ` Bruce Richardson
2021-04-21 13:01 ` Xueming(Steven) Li
2021-04-21 15:52 ` Xueming(Steven) Li
2021-04-19 0:20 ` Thomas Monjalon
2021-04-19 13:09 ` Bruce Richardson
2021-04-19 13:47 ` Thomas Monjalon
2021-04-19 14:23 ` Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 00/16] " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 01/16] build: simplify library build file Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 02/16] build: tidy up list of libraries to build Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 03/16] build: simplify the driver build configuration file Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 04/16] build: clean up driver lists Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 05/16] build: reduce indentation in app build spec Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 06/16] build: reduce indentation in examples " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 07/16] build: change infrastructure file tabs to spaces Bruce Richardson
2021-04-27 19:16 ` David Christensen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 08/16] lib: cleanup whitespace in meson build files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 09/16] drivers: change meson file tabs to spaces Bruce Richardson
2021-04-21 1:48 ` Xu, Rosen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 10/16] examples: " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 11/16] app: " Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 12/16] editorconfig: add entry for meson files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 13/16] doc: add meson coding style section to contributors guide Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 14/16] lib: remove librte_ prefix from directory names Bruce Richardson
2021-04-28 20:18 ` David Christensen
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 15/16] devtools: add script to ease backport of renamed files Bruce Richardson
2021-04-20 10:22 ` [dpdk-dev] [PATCH v2 16/16] lib: allow disabling optional libraries Bruce Richardson
2021-04-21 12:08 ` [dpdk-dev] [PATCH v2 00/16] Build file updates Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210416170458.50188-15-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).