Skip to content

Commit

Permalink
Use bundled DPDK instead of system one
Browse files Browse the repository at this point in the history
Relates #172
  • Loading branch information
GeorgyKirichenko committed Apr 18, 2024
1 parent 96cfb7f commit 46bbfa0
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 3 deletions.
1 change: 1 addition & 0 deletions cli/meson.build
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
dependencies = []
dependencies += libdpdk.get_variable('dpdk_dep')
dependencies += libyanet_protobuf_dep
dependencies += dependency('threads')

Expand Down
2 changes: 1 addition & 1 deletion dataplane/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies = []
dependencies += dependency('libdpdk', static: true)
dependencies += libdpdk.get_variable('dpdk_dep')
dependencies += dependency('libsystemd')
dependencies += dependency('threads')

Expand Down
2 changes: 1 addition & 1 deletion dataplane/unittest/meson.build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies = []
dependencies += dependency('libdpdk', static: true)
dependencies += libdpdk.get_variable('dpdk_dep')
dependencies += dependency('libsystemd')
dependencies += dependency('threads')
dependencies += dependency('gtest')
Expand Down
3 changes: 2 additions & 1 deletion logger/meson.build
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
dependencies = []
dependencies += dependency('libdpdk', static: true)
dependencies += libdpdk.get_variable('dpdk_dep')
dependencies += dependency('libsystemd')
dependencies += dependency('threads')

sources = files('main.cpp')

cpp_args = []
cpp_args += '-fno-rtti'
cpp_args += '-march=corei7'

executable('yanet-logger',
sources,
Expand Down
6 changes: 6 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ add_global_arguments('-DYANET_VERSION_REVISION=' + get_option('version_revision'
add_global_arguments('-DYANET_VERSION_HASH=' + get_option('version_hash'), language: 'cpp')
add_global_arguments('-DYANET_VERSION_CUSTOM=' + get_option('version_custom'), language: 'cpp')

libdpdk = subproject('dpdk', default_options: [
'platform=generic',
'cpu_instruction_set=corei7',
'disable_apps=dumpcap,graph,pdump,proc-info,test-acl,test-bbdev,test-cmdline,test-compress-perf,test-crypto-perf,test-dma-perf,test-eventdev,test-fib,test-flow-perf,test-gpudev,test-mldev,test-pipeline,test-pmd,test-regex,test-sad,test-security-perf',
'enable_driver_sdk=true', 'disable_drivers=net/mlx4',
'default_library=static', 'tests=false' ] )

if get_option('target').contains('buildenv')
subdir('libprotobuf')
Expand Down

0 comments on commit 46bbfa0

Please sign in to comment.