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
net/iavf: fix flow director after queue reconfigured
[dpdk.git]
/
drivers
/
meson.build
diff --git
a/drivers/meson.build
b/drivers/meson.build
index
4b17662
..
cfb6a83
100644
(file)
--- a/
drivers/meson.build
+++ b/
drivers/meson.build
@@
-9,16
+9,21
@@
endif
dpdk_driver_classes = ['common',
'bus',
'mempool', # depends on common and bus.
dpdk_driver_classes = ['common',
'bus',
'mempool', # depends on common and bus.
- '
raw', # depends on common and bus.
- '
net', # depends on common, bus, mempool and raw
.
+ '
net', # depends on common, bus, mempool
+ '
raw', # depends on common, bus and net
.
'crypto', # depends on common, bus and mempool (net in future).
'compress', # depends on common, bus, mempool.
'crypto', # depends on common, bus and mempool (net in future).
'compress', # depends on common, bus, mempool.
+ 'vdpa', # depends on common, bus and mempool.
'event', # depends on common, bus, mempool and net.
'baseband'] # depends on common and bus.
'event', # depends on common, bus, mempool and net.
'baseband'] # depends on common and bus.
-disabled_drivers = get_option('disable_drivers').split(',')
+disabled_drivers = run_command(list_dir_globs, get_option('disable_drivers'),
+ ).stdout().split()
default_cflags = machine_args
default_cflags = machine_args
+default_cflags += ['-DALLOW_EXPERIMENTAL_API']
+default_cflags += ['-DALLOW_INTERNAL_API']
+
if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
endif
if cc.has_argument('-Wno-format-truncation')
default_cflags += '-Wno-format-truncation'
endif
@@
-41,7
+46,7
@@
foreach class:dpdk_driver_classes
build = true # set to false to disable, e.g. missing deps
reason = '<unknown reason>' # set if build == false to explain
name = drv
build = true # set to false to disable, e.g. missing deps
reason = '<unknown reason>' # set if build == false to explain
name = drv
- allow_experimental_apis = false
+ fmt_name = ''
sources = []
objs = []
cflags = default_cflags
sources = []
objs = []
cflags = default_cflags
@@
-57,17
+62,14
@@
foreach class:dpdk_driver_classes
ext_deps = []
pkgconfig_extra_libs = []
ext_deps = []
pkgconfig_extra_libs = []
- # pull in driver directory which should assign to each of the above
- subdir(drv_path)
+ if disabled_drivers.contains(drv_path)
+ build = false
+ reason = 'Explicitly disabled via build config'
+ else
+ # pull in driver directory which should update all the local variables
+ subdir(drv_path)
+ endif
- # skip disabled drivers. For meson 0.49 change this to use
- # "in" keyword
- foreach disable_path: disabled_drivers
- if drv_path == disable_path
- build = false
- reason = 'Explicitly disabled via build config'
- endif
- endforeach
if build
# get dependency objs from strings
shared_deps = ext_deps
if build
# get dependency objs from strings
shared_deps = ext_deps
@@
-97,12
+99,11
@@
foreach class:dpdk_driver_classes
else
class_drivers += name
else
class_drivers += name
- dpdk_conf.set(config_flag_fmt.format(name.to_upper()),1)
- lib_name = driver_name_fmt.format(name)
-
- if allow_experimental_apis
- cflags += '-DALLOW_EXPERIMENTAL_API'
+ if fmt_name == ''
+ fmt_name = name
endif
endif
+ dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1)
+ lib_name = driver_name_fmt.format(fmt_name)
dpdk_extra_ldflags += pkgconfig_extra_libs
dpdk_extra_ldflags += pkgconfig_extra_libs
@@
-127,15
+128,15
@@
foreach class:dpdk_driver_classes
meson.current_source_dir(),
drv_path, lib_name)
meson.current_source_dir(),
drv_path, lib_name)
- is_
experimental = run_command(is_experimental
_cmd,
- files(version_map)).returncode()
+ is_
stable = run_command(is_stable
_cmd,
+ files(version_map)).returncode()
== 0
- if is_experimental != 0
- lib_version = experimental_abi_version
- so_version = experimental_so_version
- else
+ if is_stable
lib_version = abi_version
so_version = stable_so_version
lib_version = abi_version
so_version = stable_so_version
+ else
+ lib_version = experimental_abi_version
+ so_version = experimental_so_version
endif
# now build the static driver
endif
# now build the static driver
@@
-164,14
+165,14
@@
foreach class:dpdk_driver_classes
else
lk_args = ['-Wl,--version-script=' + version_map]
# on unix systems check the output of the
else
lk_args = ['-Wl,--version-script=' + version_map]
# on unix systems check the output of the
- #
experimental syms
script, using it as a
+ #
check-symbols.sh
script, using it as a
# dependency of the .so build
# dependency of the .so build
- lk_deps += custom_target(lib_name + '.
exp
_chk',
- command: [check_
experimental_sym
s,
+ lk_deps += custom_target(lib_name + '.
sym
_chk',
+ command: [check_
symbol
s,
version_map, '@INPUT@'],
capture: true,
input: static_lib,
version_map, '@INPUT@'],
capture: true,
input: static_lib,
- output: lib_name + '.
exp
_chk')
+ output: lib_name + '.
sym
_chk')
endif
shared_lib = shared_library(lib_name,
endif
shared_lib = shared_library(lib_name,