From: David Marchand <david.marchand@redhat.com>
To: dev@dpdk.org
Cc: bruce.richardson@intel.com, thomas@monjalon.net,
bluca@debian.org, tredaelli@redhat.com, i.maximets@ovn.org,
james.r.harris@intel.com, mohammed@hawari.fr
Subject: [PATCH v2 4/5] build: make pdump optional
Date: Wed, 17 Nov 2021 12:28:46 +0100 [thread overview]
Message-ID: <20211117112847.7362-5-david.marchand@redhat.com> (raw)
In-Reply-To: <20211117112847.7362-1-david.marchand@redhat.com>
This library can be made optional.
dumpcap and pdump applications depend on this library, check for
dependencies like what we have for examples.
Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
---
app/meson.build | 18 +++++++++++++-----
app/test/meson.build | 10 +++++-----
lib/meson.build | 1 +
3 files changed, 19 insertions(+), 10 deletions(-)
diff --git a/app/meson.build b/app/meson.build
index 310e83076f..93d8c15032 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -43,15 +43,23 @@ foreach app:apps
subdir(name)
+ if build
+ dep_objs = []
+ foreach d:deps
+ var_name = get_option('default_library') + '_rte_' + d
+ if not is_variable(var_name)
+ build = false
+ message('Missing dependency "@0@" for app "@1@"'.format(d, name))
+ break
+ endif
+ dep_objs += [get_variable(var_name)]
+ endforeach
+ endif
+
if not build
continue
endif
- dep_objs = []
- foreach d:deps
- dep_objs += get_variable(get_option('default_library') + '_rte_' + d)
- endforeach
-
link_libs = []
if get_option('default_library') == 'static'
link_libs = dpdk_static_libraries + dpdk_drivers
diff --git a/app/test/meson.build b/app/test/meson.build
index 0d261b1138..961bebc5cb 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -407,11 +407,9 @@ if dpdk_conf.has('RTE_NET_RING')
test_sources += 'test_pmd_ring.c'
test_sources += 'test_event_eth_tx_adapter.c'
test_sources += 'sample_packet_forward.c'
- test_sources += 'test_pdump.c'
fast_tests += [['ring_pmd_autotest', true]]
perf_test_names += 'ring_pmd_perf_autotest'
fast_tests += [['event_eth_tx_adapter_autotest', false]]
- fast_tests += [['pdump_autotest', true]]
if dpdk_conf.has('RTE_LIB_BITRATESTATS')
test_deps += 'bitratestats'
test_sources += 'test_bitratestats.c'
@@ -422,6 +420,11 @@ if dpdk_conf.has('RTE_NET_RING')
test_sources += 'test_latencystats.c'
fast_tests += [['latencystats_autotest', true]]
endif
+ if dpdk_conf.has('RTE_LIB_PDUMP')
+ test_deps += 'pdump'
+ test_sources += 'test_pdump.c'
+ fast_tests += [['pdump_autotest', true]]
+ endif
endif
if dpdk_conf.has('RTE_HAS_LIBPCAP')
@@ -438,9 +441,6 @@ endif
if dpdk_conf.has('RTE_LIB_KNI')
test_deps += 'kni'
endif
-if dpdk_conf.has('RTE_LIB_PDUMP')
- test_deps += 'pdump'
-endif
if cc.has_argument('-Wno-format-truncation')
cflags += '-Wno-format-truncation'
diff --git a/lib/meson.build b/lib/meson.build
index 961b95f4ad..dad9fce14d 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -73,6 +73,7 @@ optional_libs = [
'jobstats',
'latencystats',
'metrics',
+ 'pdump',
'power',
'vhost',
]
--
2.23.0
next prev parent reply other threads:[~2021-11-17 11:30 UTC|newest]
Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-10 16:48 [PATCH 0/5] Extend optional libraries list David Marchand
2021-11-10 16:48 ` [PATCH 1/5] ci: test build with minimum configuration David Marchand
2021-11-16 17:06 ` Thomas Monjalon
2021-11-16 20:39 ` David Marchand
2021-11-16 21:47 ` Thomas Monjalon
2021-11-10 16:48 ` [PATCH 2/5] build: make GRO/GSO optional David Marchand
2021-11-16 17:11 ` Thomas Monjalon
2021-11-10 16:48 ` [PATCH 3/5] build: make metrics libraries optional David Marchand
2021-11-16 17:12 ` Thomas Monjalon
2021-11-10 16:48 ` [PATCH 4/5] build: make pdump optional David Marchand
2021-11-16 17:14 ` Thomas Monjalon
2021-11-10 16:48 ` [PATCH 5/5] build: select optional libraries David Marchand
2021-11-10 17:34 ` Bruce Richardson
2021-11-16 17:25 ` Thomas Monjalon
2021-11-17 10:47 ` Bruce Richardson
2021-11-17 11:27 ` David Marchand
2022-01-07 16:13 ` Morten Brørup
2022-01-07 16:47 ` Stephen Hemminger
2021-11-10 17:34 ` [PATCH 0/5] Extend optional libraries list Bruce Richardson
2021-11-17 11:28 ` [PATCH v2 " David Marchand
2021-11-17 11:28 ` [PATCH v2 1/5] ci: test minimum configuration David Marchand
2021-11-17 11:50 ` Thomas Monjalon
2021-11-17 13:38 ` Aaron Conole
2021-11-17 11:28 ` [PATCH v2 2/5] build: make GRO/GSO optional David Marchand
2021-11-17 11:28 ` [PATCH v2 3/5] build: make metrics libraries optional David Marchand
2021-11-17 11:28 ` David Marchand [this message]
2021-11-17 11:28 ` [PATCH v2 5/5] build: select optional libraries David Marchand
2023-06-16 7:14 ` [PATCH v3] " David Marchand
2023-06-16 9:42 ` Bruce Richardson
2023-06-19 8:00 ` David Marchand
2023-06-19 14:11 ` David Marchand
2023-06-19 14:26 ` Bruce Richardson
2023-06-20 8:31 ` David Marchand
2023-06-20 8:35 ` Bruce Richardson
2023-06-20 8:38 ` David Marchand
2023-06-20 8:44 ` Bruce Richardson
2023-06-20 8:48 ` David Marchand
2023-06-20 9:03 ` Bruce Richardson
2023-06-20 14:33 ` Thomas Monjalon
2023-06-20 14:40 ` Bruce Richardson
2023-06-20 15:01 ` Bruce Richardson
2023-06-21 9:54 ` David Marchand
2023-06-21 10:49 ` Bruce Richardson
2023-06-21 11:35 ` Morten Brørup
2023-06-22 9:27 ` Juraj Linkeš
2023-06-21 17:00 ` [PATCH v4 0/4] Select " David Marchand
2023-06-21 17:00 ` [PATCH v4 1/4] kni: move IOVA build check David Marchand
2023-06-22 8:37 ` Bruce Richardson
2023-06-21 17:00 ` [PATCH v4 2/4] build: rename enabled libraries list David Marchand
2023-06-22 8:38 ` Bruce Richardson
2023-06-21 17:00 ` [PATCH v4 3/4] build: select deprecated libraries David Marchand
2023-06-22 8:43 ` Bruce Richardson
2023-06-22 8:50 ` Bruce Richardson
2023-06-23 9:35 ` David Marchand
2023-06-23 11:04 ` Bruce Richardson
2023-06-23 11:15 ` Morten Brørup
2023-06-23 11:19 ` Bruce Richardson
2023-06-23 11:32 ` Morten Brørup
2023-06-28 12:10 ` David Marchand
2023-06-21 17:00 ` [PATCH v4 4/4] build: select optional libraries David Marchand
2023-06-22 8:49 ` Bruce Richardson
2023-06-22 9:09 ` [PATCH v4 0/4] Select " Bruce Richardson
2023-06-22 16:41 ` Thomas Monjalon
2023-06-28 13:20 ` [PATCH v5 0/2] " David Marchand
2023-06-28 13:20 ` [PATCH v5 1/2] build: select deprecated libraries David Marchand
2023-06-29 12:44 ` Aaron Conole
2023-06-28 13:20 ` [PATCH v5 2/2] build: select optional libraries David Marchand
2023-06-28 14:48 ` [PATCH v5 0/2] Select " Morten Brørup
2023-07-17 12:54 ` Bruce Richardson
2021-11-17 11:52 ` [PATCH v2 0/5] Extend optional libraries list 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=20211117112847.7362-5-david.marchand@redhat.com \
--to=david.marchand@redhat.com \
--cc=bluca@debian.org \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=i.maximets@ovn.org \
--cc=james.r.harris@intel.com \
--cc=mohammed@hawari.fr \
--cc=thomas@monjalon.net \
--cc=tredaelli@redhat.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).