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: generate version map file for MinGW
[dpdk.git]
/
lib
/
meson.build
diff --git
a/lib/meson.build
b/lib/meson.build
index
c28b8df
..
cbcb985
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,13
+33,16
@@
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', '
telemetry
']
+ 'flow_classify', 'bpf', '
graph', 'node
']
if is_windows
libraries = ['kvargs','eal'] # only supported libraries for windows
endif
if is_windows
libraries = ['kvargs','eal'] # only supported libraries for windows
endif
-default_cflags = machine_args + ['-DALLOW_EXPERIMENTAL_API']
+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
@@
-106,15
+110,15
@@
foreach l:libraries
version_map = '@0@/@1@/rte_@2@_version.map'.format(
meson.current_source_dir(), dir_name, name)
version_map = '@0@/@1@/rte_@2@_version.map'.format(
meson.current_source_dir(), dir_name, 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
# first build static lib
endif
# first build static lib
@@
-142,29
+146,38
@@
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
if not is_windows
# 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(name + '.
exp
_chk',
- command: [check_
experimental_sym
s,
+ lk_deps += custom_target(name + '.
sym
_chk',
+ command: [check_
symbol
s,
version_map, '@INPUT@'],
capture: true,
input: static_lib,
version_map, '@INPUT@'],
capture: true,
input: static_lib,
- output: name + '.
exp
_chk')
+ output: name + '.
sym
_chk')
endif
shared_lib = shared_library(libname,
endif
shared_lib = shared_library(libname,
@@
-184,6
+197,9
@@
foreach l:libraries
dpdk_libraries = [shared_lib] + dpdk_libraries
dpdk_static_libraries = [static_lib] + dpdk_static_libraries
dpdk_libraries = [shared_lib] + dpdk_libraries
dpdk_static_libraries = [static_lib] + dpdk_static_libraries
+ if libname == 'rte_node'
+ dpdk_graph_nodes = [static_lib]
+ endif
endif # sources.length() > 0
set_variable('shared_rte_' + name, shared_dep)
endif # sources.length() > 0
set_variable('shared_rte_' + name, shared_dep)