From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
juraj.linkes@pantheon.tech
Subject: [dpdk-dev] [PATCH] build: fix building when essential drivers in disable list
Date: Wed, 18 Aug 2021 14:42:40 +0100 [thread overview]
Message-ID: <20210818134240.480605-1-bruce.richardson@intel.com> (raw)
The PCI and vdev bus drivers cannot be disabled for DPDK builds and
special logic is put in place to not skip them when they are specified
in the disable list. This logic is broken though, as the inclusion of
the driver-specific meson.build file is only included in the "else" leg
of the condition check. This means that when they are specified as
disabled the PCI and vdev buses are not disabled, but neither are their
source files compiled.
Fix this by moving the "subdir()" call into the next "if build" block,
ensuring that if not disabled the sources are always included. To take
account of the fact that the subdir call could itself disable the
driver, we add a break call into the following loop to ensure we quickly
fall through to the following block which stops processing appropriately
if the driver is disabled.
Fixes: 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
Cc: juraj.linkes@pantheon.tech
Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/meson.build | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/meson.build b/drivers/meson.build
index bc6f4f567f..747c93fe9c 100644
--- a/drivers/meson.build
+++ b/drivers/meson.build
@@ -109,16 +109,19 @@ foreach subpath:subdirs
build = false
reason = 'explicitly disabled via build config'
endif
- else
- # pull in driver directory which should update all the local variables
- subdir(drv_path)
endif
if build
+ # pull in driver directory which should update all the local variables
+ subdir(drv_path)
+
# get dependency objs from strings
shared_deps = ext_deps
static_deps = ext_deps
foreach d:deps
+ if not build
+ break
+ endif
if not is_variable('shared_rte_' + d)
build = false
reason = 'missing internal dependency, "@0@"'.format(d)
--
2.30.2
next reply other threads:[~2021-08-18 13:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 13:42 Bruce Richardson [this message]
2021-09-09 13:38 ` Nicolau, Radu
2021-09-15 14:07 ` 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=20210818134240.480605-1-bruce.richardson@intel.com \
--to=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=juraj.linkes@pantheon.tech \
/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).