Skip to content

Commit

Permalink
build_command should check for system spicyz before falling back to s…
Browse files Browse the repository at this point in the history
…picy-plugin/build/bin/spicyz (allows plugin to work with Zeek v5.0.0's built-in spicy plugin, see https://github.com/zeek/spicy-ldap/blob/06690d5f82598b127a491314e314a6d17d1ca082/zkg.meta#L6=); and, allow customization of C++ toolchain via canonical environment variables (see zeek/spicy-ldap@06690d5)

Signed-off-by: Seth Grover <[email protected]>
  • Loading branch information
mmguero committed Jul 7, 2022
1 parent 7ec4cda commit fc2bfc3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions zkg.meta
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ summary = An IPSec Zeek protocol analyzer based on Spicy.
description = An IPSec Zeek protocol analyzer based on Spicy.
script_dir = analyzer
plugin_dir = build/spicy-modules
build_command = unset -v CXX CXXFLAGS LD LDFLAGS && mkdir -p build && cd build && SPICYZ=%(package_base)s/spicy-plugin/build/bin/spicyz cmake .. && cmake --build .
test_command = unset -v CXX CXXFLAGS LD LDFLAGS && cd tests && PATH=$(zkg config plugin_dir)/packages/spicy-plugin/bin:$PATH btest -d -j $(nproc)
build_command = mkdir -p build && cd build && SPICYZ=$(command -v spicyz || echo %(package_base)s/spicy-plugin/build/bin/spicyz) cmake .. && cmake --build .
test_command = cd tests && PATH=$(zkg config plugin_dir)/packages/spicy-plugin/bin:$PATH btest -d -j $(nproc)

[template]
source = package-template-spicy
Expand Down

0 comments on commit fc2bfc3

Please sign in to comment.