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/hns3: fix build with SVE
[dpdk.git]
/
drivers
/
meson.build
diff --git
a/drivers/meson.build
b/drivers/meson.build
index
3d4bbff
..
f9febc5
100644
(file)
--- a/
drivers/meson.build
+++ b/
drivers/meson.build
@@
-33,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('/')
@@
-63,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)]
@@
-79,7
+77,7
@@
foreach subpath:subdirs
if disabled_drivers.contains(drv_path)
build = false
if disabled_drivers.contains(drv_path)
build = false
- reason = '
E
xplicitly disabled via build config'
+ reason = '
e
xplicitly disabled via build config'
else
# pull in driver directory which should update all the local variables
subdir(drv_path)
else
# pull in driver directory which should update all the local variables
subdir(drv_path)
@@
-92,7
+90,7
@@
foreach subpath:subdirs
foreach d:deps
if not is_variable('shared_rte_' + d)
build = false
foreach d:deps
if not is_variable('shared_rte_' + d)
build = false
- reason = '
M
issing internal dependency, "@0@"'.format(d)
+ reason = '
m
issing internal dependency, "@0@"'.format(d)
message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
.format(d, name, 'drivers/' + drv_path))
else
message('Disabling @1@ [@2@]: missing internal dependency "@0@"'
.format(d, name, 'drivers/' + drv_path))
else
@@
-113,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
@@
-133,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
@@
-184,8
+186,10
@@
foreach subpath:subdirs
lk_deps = [version_map, def_file, mingw_map]
if is_windows
if is_ms_linker
lk_deps = [version_map, def_file, mingw_map]
if is_windows
if is_ms_linker
- lk_args = ['-Wl,/def:' + def_file.full_path(),
- '-Wl,/implib:drivers\\' + implib]
+ lk_args = ['-Wl,/def:' + def_file.full_path()]
+ if meson.version().version_compare('<0.54.0')
+ lk_args += ['-Wl,/implib:drivers\\' + implib]
+ endif
else
lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
endif
else
lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
endif