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/mlx5: locate aging pools in the general container
[dpdk.git]
/
drivers
/
meson.build
diff --git
a/drivers/meson.build
b/drivers/meson.build
index
b5ac483
..
4bb7e92
100644
(file)
--- a/
drivers/meson.build
+++ b/
drivers/meson.build
@@
-6,6
+6,7
@@
subdirs = [
'common',
'bus',
'common/mlx5', # depends on bus.
'common',
'bus',
'common/mlx5', # depends on bus.
+ 'common/qat', # depends on bus.
'mempool', # depends on common and bus.
'net', # depends on common, bus, mempool
'raw', # depends on common, bus and net.
'mempool', # depends on common and bus.
'net', # depends on common, bus, mempool
'raw', # depends on common, bus and net.
@@
-32,9
+33,6
@@
foreach subpath:subdirs
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
drivers = []
std_deps = []
config_flag_fmt = '' # format string used to set the value in dpdk_conf
- driver_name_fmt = '' # format string for driver name, used to name
- # the library, the dependency and to find the
- # version file for linking
# subpath can be either "class" or "class/driver"
if subpath.contains('/')
# subpath can be either "class" or "class/driver"
if subpath.contains('/')
@@
-62,6
+60,7
@@
foreach subpath:subdirs
name = drv
fmt_name = ''
sources = []
name = drv
fmt_name = ''
sources = []
+ headers = []
objs = []
cflags = default_cflags
includes = [include_directories(drv_path)]
objs = []
cflags = default_cflags
includes = [include_directories(drv_path)]
@@
-112,11
+111,14
@@
foreach subpath:subdirs
endif
else
enabled_drivers += name
endif
else
enabled_drivers += name
+ lib_name = '_'.join(['rte', class, name])
+ dpdk_conf.set(lib_name.to_upper(), 1)
if fmt_name == ''
fmt_name = name
endif
if fmt_name == ''
fmt_name = name
endif
- dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1)
+
+ dpdk_conf.set(config_flag_fmt.format(fmt_name.to_upper()),1) #old-style macro
# for driver compatibility, since we changed the
# default to match that of make. Remove in future release
# after following deprecation process
# for driver compatibility, since we changed the
# default to match that of make. Remove in future release
# after following deprecation process
@@
-132,10
+134,11
@@
foreach subpath:subdirs
dpdk_conf.set(alt_flag_fmt.format(
fmt_name.to_upper()), 1)
endif
dpdk_conf.set(alt_flag_fmt.format(
fmt_name.to_upper()), 1)
endif
- lib_name = driver_name_fmt.format(fmt_name)
dpdk_extra_ldflags += pkgconfig_extra_libs
dpdk_extra_ldflags += pkgconfig_extra_libs
+ install_headers(headers)
+
# generate pmdinfo sources by building a temporary
# lib and then running pmdinfogen on the contents of
# that lib. The final lib reuses the object files and
# generate pmdinfo sources by building a temporary
# lib and then running pmdinfogen on the contents of
# that lib. The final lib reuses the object files and
@@
-165,9
+168,9
@@
foreach subpath:subdirs
install: true)
# now build the shared driver
install: true)
# now build the shared driver
- version_map = '@0@/@1@/
@2@_
version.map'.format(
+ version_map = '@0@/@1@/version.map'.format(
meson.current_source_dir(),
meson.current_source_dir(),
- drv_path
, lib_name
)
+ drv_path)
implib = 'lib' + lib_name + '.dll.a'
def_file = custom_target(lib_name + '_def',
implib = 'lib' + lib_name + '.dll.a'
def_file = custom_target(lib_name + '_def',