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
build: remove special handling for node library
[dpdk.git]
/
lib
/
meson.build
diff --git
a/lib/meson.build
b/lib/meson.build
index
5ac94cd
..
8ca2517
100644
(file)
--- a/
lib/meson.build
+++ b/
lib/meson.build
@@
-10,6
+10,7
@@
# core libs which are widely reused, so their deps are kept to a minimum.
libraries = [
'kvargs', # eal depends on kvargs
# core libs which are widely reused, so their deps are kept to a minimum.
libraries = [
'kvargs', # eal depends on kvargs
+ 'telemetry', # basic info querying
'eal', # everything depends on eal
'ring',
'rcu', # rcu depends on ring
'eal', # everything depends on eal
'ring',
'rcu', # rcu depends on ring
@@
-32,10
+33,15
@@
libraries = [
# add pkt framework libs which use other libs from above
'port', 'table', 'pipeline',
# flow_classify lib depends on pkt framework table lib
# add pkt framework libs which use other libs from above
'port', 'table', 'pipeline',
# flow_classify lib depends on pkt framework table lib
- 'flow_classify', 'bpf', 'graph', '
telemetry
']
+ 'flow_classify', 'bpf', 'graph', '
node
']
if is_windows
if is_windows
- libraries = ['kvargs','eal'] # only supported libraries for windows
+ libraries = [
+ 'kvargs',
+ 'eal',
+ 'ring',
+ 'pci',
+ ] # only supported libraries for windows
endif
default_cflags = machine_args
endif
default_cflags = machine_args
@@
-128,7
+134,7
@@
foreach l:libraries
dependencies: static_deps,
include_directories: includes,
install: true)
dependencies: static_deps,
include_directories: includes,
install: true)
- static_dep = declare_dependency(
link_with: static_lib,
+ static_dep = declare_dependency(
include_directories: includes,
dependencies: static_deps)
include_directories: includes,
dependencies: static_deps)
@@
-145,19
+151,28
@@
foreach l:libraries
meson.current_source_dir(), dir_name, name)
implib = dir_name + '.dll.a'
meson.current_source_dir(), dir_name, name)
implib = dir_name + '.dll.a'
- def_file = custom_target(name + '_def',
- command: [map_to_
def
_cmd, '@INPUT@', '@OUTPUT@'],
+ def_file = custom_target(
lib
name + '_def',
+ command: [map_to_
win
_cmd, '@INPUT@', '@OUTPUT@'],
input: version_map,
input: version_map,
- output: 'rte_@0@_exports.def'.format(name))
+ output: '@0@_exports.def'.format(libname))
+
+ mingw_map = custom_target(libname + '_mingw',
+ command: [map_to_win_cmd, '@INPUT@', '@OUTPUT@'],
+ input: version_map,
+ output: '@0@_mingw.map'.format(libname))
if is_ms_linker
lk_args = ['-Wl,/def:' + def_file.full_path(),
'-Wl,/implib:lib\\' + implib]
else
if is_ms_linker
lk_args = ['-Wl,/def:' + def_file.full_path(),
'-Wl,/implib:lib\\' + implib]
else
- lk_args = ['-Wl,--version-script=' + version_map]
+ if is_windows
+ lk_args = ['-Wl,--version-script=' + mingw_map.full_path()]
+ else
+ lk_args = ['-Wl,--version-script=' + version_map]
+ endif
endif
endif
- lk_deps = [version_map, def_file]
+ lk_deps = [version_map, def_file
, mingw_map
]
if not is_windows
# on unix systems check the output of the
# check-symbols.sh script, using it as a
if not is_windows
# on unix systems check the output of the
# check-symbols.sh script, using it as a