Skip to content

Commit

Permalink
make fgen library optional
Browse files Browse the repository at this point in the history
Signed-off-by: Keith Wiles <[email protected]>
  • Loading branch information
KeithWiles committed May 9, 2024
1 parent 9dbb3f2 commit 24d05f3
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.05.1
24.05.2
4 changes: 3 additions & 1 deletion app/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ cflags = ['-D__PROJECT_VERSION="' + meson.project_version() + '"']

deps = [dpdk, common, utils, vec, plugin, cli, lua, hmap]

deps += [dependency('libfgen', required: true)]
if fgen_dep.found()
deps += [fgen_dep]
endif

deps += [cc.find_library('rte_net_i40e', dirs: [dpdk_libs_path], required: false)]
deps += [cc.find_library('rte_net_ixgbe', dirs: [dpdk_libs_path], required: false)]
Expand Down
1 change: 1 addition & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ Pktgen-DPDK - Traffic Generator powered by DPDK
** (Pktgen) Sounds like 'Packet-Gen'**

**=== Modifications ===**
- 24.05.2 - Make fgen requirement optional, which removes pktperf example.
- 24.05.1 - Merge in the performance updates and remove old/unused features.
- 24.05.0 - Update copyright and add comments to README.md and INSTALL.md files to point
users to Pktgen-DPDK on GitHub as the primary supported version.
Expand Down
10 changes: 6 additions & 4 deletions examples/meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) <2023> Intel Corporation

subdirs =['pktperf']
foreach d:subdirs
subdir(d)
endforeach
if fgen_dep.found()
subdirs =['pktperf']
foreach d:subdirs
subdir(d)
endforeach
endif
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ foreach arg: warning_flags
endif
endforeach

fgen_dep = dependency('libfgen', required: true)
fgen_dep = dependency('libfgen', required: false)

lua_dep = dependency('', required: false)

Expand Down

0 comments on commit 24d05f3

Please sign in to comment.