Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ clean:
install: $(BUILDDIR)/build.ninja
$Q meson install -C $(BUILDDIR) --skip-subprojects

meson_opts = --buildtype=$(BUILDTYPE) --werror --warnlevel=2 -Db_sanitize=$(SANITIZE)
meson_opts = --buildtype=$(BUILDTYPE) --werror --warnlevel=2
meson_opts += -Db_sanitize=$(SANITIZE) -Ddpdk_static=true
meson_opts += $(MESON_EXTRA_OPTS)

$(BUILDDIR)/build.ninja:
Expand Down
1 change: 1 addition & 0 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ meson_opts := --wrap-mode=default
meson_opts += --auto-features=enabled
meson_opts += -Ddpdk:platform=generic
meson_opts += -Dfrr=enabled
meson_opts += -Ddpdk_static=true

build = $(CURDIR)/debian/_build
dest = $(CURDIR)/debian/tmp
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ dpdk_dep = dependency(
default_options: [
'buildtype=release',
'c_std=c11',
'default_library=static',
'werror=false',
'enable_kmods=false',
'tests=false',
Expand All @@ -73,6 +72,7 @@ dpdk_dep = dependency(
'enable_docs=false',
'developer_mode=disabled',
],
static: get_option('dpdk_static'),
)

ev_core_dep = dependency('libevent_core')
Expand Down
5 changes: 5 additions & 0 deletions meson_options.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ option(
'tests', type: 'feature', value: 'auto',
description: 'Build unit-tests. If set to "auto", only build if cmocka is found.',
)

option(
'dpdk_static', type: 'boolean', value: false,
description: 'If set to true, link against static DPDK libraries.',
)
2 changes: 1 addition & 1 deletion rpm/grout.spec
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Requires: frr = %(sed -n "s/revision = frr-//p" subprojects/frr.wrap)
FRR dplane plugin for grout

%build
%meson -Ddpdk:platform=generic -Dfrr=enabled
%meson -Ddpdk:platform=generic -Dfrr=enabled -Ddpdk_static=true
%meson_build

%install
Expand Down
2 changes: 1 addition & 1 deletion subprojects/dpdk.wrap
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[wrap-git]
url = https://github.com/DPDK/dpdk-stable
revision = v24.11.1
revision = v24.11.3
depth = 1

[provide]
Expand Down