From: <agupta3@marvell.com>
To: Harman Kalra <hkalra@marvell.com>
Cc: <dev@dpdk.org>, Amit Gupta <agupta3@marvell.com>
Subject: [dpdk-dev] [PATCH] net/octeontx: meson build fix if octeontx drivers are disabled
Date: Mon, 17 Feb 2020 13:10:29 +0530 [thread overview]
Message-ID: <1581925230-14866-1-git-send-email-agupta3@marvell.com> (raw)
From: Amit Gupta <agupta3@marvell.com>
Add a condition to check if octeontx drivers are disabled.
octeontx drivers are built only if dependent drivers i.e.
ethdev, mempool and common/octeontx are enabled.
BugZilla ID # BUG 387
Change-Id: Idf9578fc04345e690ac48b4836faff2e25170331
Signed-off-by: Amit Gupta <agupta3@marvell.com>
---
drivers/net/octeontx/base/meson.build | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/drivers/net/octeontx/base/meson.build b/drivers/net/octeontx/base/meson.build
index a06a2c8..50e7972 100644
--- a/drivers/net/octeontx/base/meson.build
+++ b/drivers/net/octeontx/base/meson.build
@@ -9,17 +9,33 @@ sources = [
depends = ['ethdev', 'mempool_octeontx']
static_objs = []
-foreach d: depends
- static_objs += [get_variable('static_rte_' + d)]
+
+disabled_drivers = get_option('disable_drivers').split(',')
+
+build = true
+foreach disable_path: disabled_drivers
+ if (('net/octeontx' == disable_path) or
+ ('event/octeontx' == disable_path) or
+ ('common/octeontx' == disable_path) or
+ ('mempool/octeontx' == disable_path))
+ build = false
+ endif
endforeach
c_args = cflags
if allow_experimental_apis
- c_args += '-DALLOW_EXPERIMENTAL_API'
+ c_args += '-DALLOW_EXPERIMENTAL_API'
endif
-base_lib = static_library('octeontx_base', sources,
- c_args: c_args,
- dependencies: static_objs,
-)
-base_objs = base_lib.extract_all_objects()
+if build
+ foreach d: depends
+ static_objs += [get_variable('static_rte_' + d)]
+ endforeach
+
+ base_lib = static_library('octeontx_base', sources,
+ c_args: c_args,
+ dependencies: static_objs,
+ )
+
+ base_objs = base_lib.extract_all_objects()
+endif
--
1.8.3.1
next reply other threads:[~2020-02-17 7:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 7:40 agupta3 [this message]
2020-04-06 9:56 ` Harman Kalra
2020-02-17 7:47 agupta3
2020-02-17 9:54 ` David Marchand
2020-02-17 10:48 ` Bruce Richardson
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=1581925230-14866-1-git-send-email-agupta3@marvell.com \
--to=agupta3@marvell.com \
--cc=dev@dpdk.org \
--cc=hkalra@marvell.com \
/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).