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
node: fix missing header include
[dpdk.git]
/
examples
/
meson.build
diff --git
a/examples/meson.build
b/examples/meson.build
index
9d46870
..
b9ab242
100644
(file)
--- a/
examples/meson.build
+++ b/
examples/meson.build
@@
-1,9
+1,9
@@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2017-2019 Intel Corporation
-
driver
_libs = []
+
link_whole
_libs = []
if get_option('default_library') == 'static'
if get_option('default_library') == 'static'
-
driver_libs =
dpdk_drivers
+
link_whole_libs = dpdk_static_libraries +
dpdk_drivers
endif
execinfo = cc.find_library('execinfo', required: false)
endif
execinfo = cc.find_library('execinfo', required: false)
@@
-23,7
+23,7
@@
all_examples = [
'l2fwd', 'l2fwd-cat', 'l2fwd-event',
'l2fwd-crypto', 'l2fwd-jobstats',
'l2fwd-keepalive', 'l3fwd',
'l2fwd', 'l2fwd-cat', 'l2fwd-event',
'l2fwd-crypto', 'l2fwd-jobstats',
'l2fwd-keepalive', 'l3fwd',
- 'l3fwd-acl', 'l3fwd-power',
+ 'l3fwd-acl', 'l3fwd-power',
'l3fwd-graph',
'link_status_interrupt',
'multi_process/client_server_mp/mp_client',
'multi_process/client_server_mp/mp_server',
'link_status_interrupt',
'multi_process/client_server_mp/mp_client',
'multi_process/client_server_mp/mp_server',
@@
-33,26
+33,20
@@
all_examples = [
'ntb', 'packet_ordering',
'performance-thread/l3fwd-thread',
'performance-thread/pthread_shim',
'ntb', 'packet_ordering',
'performance-thread/l3fwd-thread',
'performance-thread/pthread_shim',
+ 'pipeline',
'ptpclient',
'qos_meter', 'qos_sched',
'rxtx_callbacks',
'server_node_efd/node',
'server_node_efd/server',
'service_cores',
'ptpclient',
'qos_meter', 'qos_sched',
'rxtx_callbacks',
'server_node_efd/node',
'server_node_efd/server',
'service_cores',
- 'skeleton',
'tep_termination',
+ 'skeleton',
'timer', 'vdpa',
'vhost', 'vhost_crypto',
'timer', 'vdpa',
'vhost', 'vhost_crypto',
- 'vm_power_manager',
+ 'v
host_blk', 'v
m_power_manager',
'vm_power_manager/guest_cli',
'vmdq', 'vmdq_dcb',
]
'vm_power_manager/guest_cli',
'vmdq', 'vmdq_dcb',
]
-# install all example code on install - irrespective of whether the example in
-# question is to be built as part of this build or not.
-foreach ex:all_examples
- install_subdir(ex,
- install_dir: get_option('datadir') + '/dpdk/examples',
- exclude_files: 'meson.build')
-endforeach
if get_option('examples') == ''
subdir_done()
if get_option('examples') == ''
subdir_done()
@@
-69,6
+63,10
@@
default_cflags = machine_args
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
+default_ldflags = dpdk_extra_ldflags
+if get_option('default_library') == 'static' and not is_windows
+ default_ldflags += ['-Wl,--export-dynamic']
+endif
foreach example: examples
name = example.split('/')[-1]
foreach example: examples
name = example.split('/')[-1]
@@
-76,13
+74,11
@@
foreach example: examples
sources = []
allow_experimental_apis = false
cflags = default_cflags
sources = []
allow_experimental_apis = false
cflags = default_cflags
+ ldflags = default_ldflags
ext_deps = [execinfo]
includes = [include_directories(example)]
deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
ext_deps = [execinfo]
includes = [include_directories(example)]
deps = ['eal', 'mempool', 'net', 'mbuf', 'ethdev', 'cmdline']
- if is_windows
- deps = ['eal'] # only supported lib on Windows currently
- endif
subdir(example)
if build
subdir(example)
if build
@@
-99,8
+95,8
@@
foreach example: examples
endif
executable('dpdk-' + name, sources,
include_directories: includes,
endif
executable('dpdk-' + name, sources,
include_directories: includes,
- link_whole:
driver
_libs,
- link_args:
dpdk_extra_
ldflags,
+ link_whole:
link_whole
_libs,
+ link_args: ldflags,
c_args: cflags,
dependencies: dep_objs)
elif not allow_skips
c_args: cflags,
dependencies: dep_objs)
elif not allow_skips