build: make pdump optional

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>
This commit is contained in:
David Marchand 2021-11-17 12:28:46 +01:00 committed by Thomas Monjalon
parent bb9be9a45e
commit cbff4d8dc9
3 changed files with 19 additions and 10 deletions

View File

@ -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

View File

@ -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'

View File

@ -73,6 +73,7 @@ optional_libs = [
'jobstats',
'latencystats',
'metrics',
'pdump',
'power',
'vhost',
]