d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: move variable for drivers to top level

Browse Source 
If for debugging we disable the driver directory in the meson.build file,
we get an error because the variable "driver_classes" does not exist.
This is because driver_classes is only defined in the
drivers/meson.build file. Defining driver_classes in dpdk/meson.build file
will make it easier for compiling separate directories.

In the process, we rename driver_classes to dpdk_driver_classes for
consistency with the other variables.

Signed-off-by: Andrius Sirvys <andrius.sirvys@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Andrius Sirvys 2019-03-25 10:34:59 +00:00 committed by Thomas Monjalon
parent cf123ee7c4
commit 0ffbdd1d8d
2 changed files with 4 additions and 3 deletions

4
drivers/meson.build

@ -2,7 +2,7 @@
# Copyright(c) 2017 Intel Corporation # Copyright(c) 2017 Intel Corporation
# Defines the order in which the drivers are buit. # Defines the order in which the drivers are buit.
driver_classes = ['common', dpdk_driver_classes = ['common',
'bus', 'bus',
'mempool', # depends on common and bus. 'mempool', # depends on common and bus.
'net', # depends on common, bus and mempool. 'net', # depends on common, bus and mempool.
@ -20,7 +20,7 @@ endif
# specify -D_GNU_SOURCE unconditionally # specify -D_GNU_SOURCE unconditionally
default_cflags += '-D_GNU_SOURCE' default_cflags += '-D_GNU_SOURCE'
foreach class:driver_classes foreach class:dpdk_driver_classes
drivers = [] drivers = []
std_deps = [] std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf config_flag_fmt = '' # format string used to set the value in dpdk_conf

3
meson.build

@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
dpdk_conf = configuration_data() dpdk_conf = configuration_data()
dpdk_libraries = [] dpdk_libraries = []
dpdk_static_libraries = [] dpdk_static_libraries = []
dpdk_driver_classes = []
dpdk_drivers = [] dpdk_drivers = []
dpdk_extra_ldflags = [] dpdk_extra_ldflags = []
dpdk_app_link_libraries = [] dpdk_app_link_libraries = []
@ -105,7 +106,7 @@ endforeach
message(output_message + '\n') message(output_message + '\n')
output_message = '\n===============\nDrivers Enabled\n===============\n' output_message = '\n===============\nDrivers Enabled\n===============\n'
foreach class:driver_classes foreach class:dpdk_driver_classes
class_drivers = get_variable(class + '_drivers') class_drivers = get_variable(class + '_drivers')
output_message += '\n' + class + ':\n\t' output_message += '\n' + class + ':\n\t'
output_count = 0 output_count = 0