[v3] build: move variable definition to top level
Checks
Commit Message
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>
---
v3: Updated commit message to more accurately reflect the changes
---
drivers/meson.build | 4 ++--
lib/librte_acl/meson.build | 2 +-
meson.build | 3 ++-
3 files changed, 5 insertions(+), 4 deletions(-)
Comments
On Thu, Mar 07, 2019 at 09:56:31AM +0000, Andrius Sirvys wrote:
> 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>
@@ -2,7 +2,7 @@
# Copyright(c) 2017 Intel Corporation
# Defines the order in which the drivers are buit.
-driver_classes = ['common',
+dpdk_driver_classes = ['common',
'bus',
'mempool', # depends on common and bus.
'net', # depends on common, bus and mempool.
@@ -20,7 +20,7 @@ endif
# specify -D_GNU_SOURCE unconditionally
default_cflags += '-D_GNU_SOURCE'
-foreach class:driver_classes
+foreach class:dpdk_driver_classes
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
@@ -23,7 +23,7 @@ if arch_subdir == 'x86'
avx2_tmplib = static_library('avx2_tmp',
'acl_run_avx2.c',
dependencies: static_rte_eal,
- c_args: '-mavx2')
+ c_args: cflags + ['-mavx2'])
objs += avx2_tmplib.extract_objects('acl_run_avx2.c')
cflags += '-DCC_AVX2_SUPPORT'
endif
@@ -13,6 +13,7 @@ cc = meson.get_compiler('c')
dpdk_conf = configuration_data()
dpdk_libraries = []
dpdk_static_libraries = []
+dpdk_driver_classes = []
dpdk_drivers = []
dpdk_extra_ldflags = []
dpdk_app_link_libraries = []
@@ -110,7 +111,7 @@ message(output_message + '\n')
# track driver lists easily
if meson.version().version_compare('>=0.47')
output_message = '\n===============\nDrivers Enabled\n===============\n'
- foreach class:driver_classes
+ foreach class:dpdk_driver_classes
class_drivers = get_variable(class + '_drivers')
output_message += '\n' + class + ':\n\t'
output_count = 0