git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/net: fix typo in vector Rx comment
[dpdk.git]
/
drivers
/
meson.build
diff --git
a/drivers/meson.build
b/drivers/meson.build
index
b78cac3
..
d9e331e
100644
(file)
--- a/
drivers/meson.build
+++ b/
drivers/meson.build
@@
-27,13
+27,13
@@
endif
# add cmdline disabled drivers and meson disabled drivers together
disable_drivers += ',' + get_option('disable_drivers')
# add cmdline disabled drivers and meson disabled drivers together
disable_drivers += ',' + get_option('disable_drivers')
-disable_drivers = run_command(list_dir_globs, disable_drivers).stdout().split()
+disable_drivers = run_command(list_dir_globs, disable_drivers
, check: true
).stdout().split()
# add cmdline enabled drivers and meson enabled drivers together
enable_drivers = ',' + get_option('enable_drivers')
# add cmdline enabled drivers and meson enabled drivers together
enable_drivers = ',' + get_option('enable_drivers')
-enable_drivers = run_command(list_dir_globs, enable_drivers).stdout().split()
+enable_drivers = run_command(list_dir_globs, enable_drivers
, check: true
).stdout().split()
if enable_drivers.length() == 0
if enable_drivers.length() == 0
- enable_drivers = run_command(list_dir_globs, '*/*').stdout().split()
+ enable_drivers = run_command(list_dir_globs, '*/*'
, check: true
).stdout().split()
endif
# these drivers must always be enabled, otherwise the build breaks
endif
# these drivers must always be enabled, otherwise the build breaks
@@
-51,6
+51,7
@@
endif
foreach subpath:subdirs
drivers = []
std_deps = []
foreach subpath:subdirs
drivers = []
std_deps = []
+ log_prefix = ''
# subpath can be either "class" or "class/driver"
if subpath.contains('/')
# subpath can be either "class" or "class/driver"
if subpath.contains('/')
@@
-69,6
+70,12
@@
foreach subpath:subdirs
# get already enabled drivers of the same class
enabled_drivers = get_variable(class + '_drivers', [])
# get already enabled drivers of the same class
enabled_drivers = get_variable(class + '_drivers', [])
+ # default log prefix can be defined per class
+ if log_prefix == ''
+ # default log name is pmd.class.driver
+ log_prefix = 'pmd.' + class
+ endif
+
foreach drv:drivers
drv_path = join_paths(class, drv)
foreach drv:drivers
drv_path = join_paths(class, drv)
@@
-137,6
+144,7
@@
foreach subpath:subdirs
enabled_drivers += name
lib_name = '_'.join(['rte', class, name])
enabled_drivers += name
lib_name = '_'.join(['rte', class, name])
+ cflags += '-DRTE_LOG_DEFAULT_LOGTYPE=' + '.'.join([log_prefix, name])
dpdk_conf.set(lib_name.to_upper(), 1)
dpdk_extra_ldflags += pkgconfig_extra_libs
dpdk_conf.set(lib_name.to_upper(), 1)
dpdk_extra_ldflags += pkgconfig_extra_libs
@@
-152,7
+160,7
@@
foreach subpath:subdirs
include_directories: includes,
dependencies: static_deps,
c_args: cflags)
include_directories: includes,
dependencies: static_deps,
c_args: cflags)
- objs += tmp_lib.extract_all_objects()
+ objs += tmp_lib.extract_all_objects(
recursive: true
)
sources = custom_target(out_filename,
command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
output: out_filename,
sources = custom_target(out_filename,
command: [pmdinfo, tmp_lib.full_path(), '@OUTPUT@', pmdinfogen],
output: out_filename,