From 0ffbdd1d8d2ab43cff01d56ccd86c092aaa6df39 Mon Sep 17 00:00:00 2001 From: Andrius Sirvys Date: Mon, 25 Mar 2019 10:34:59 +0000 Subject: [PATCH] build: move variable for drivers to top level 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 Acked-by: Bruce Richardson --- drivers/meson.build | 4 ++-- meson.build | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/meson.build b/drivers/meson.build index 69d0556d32..8c76a5659a 100644 --- a/drivers/meson.build +++ b/drivers/meson.build @@ -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 diff --git a/meson.build b/meson.build index 69833de821..e945a27c37 100644 --- a/meson.build +++ b/meson.build @@ -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 = [] @@ -105,7 +106,7 @@ endforeach message(output_message + '\n') 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 -- 2.20.1