Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/bbannier/issue-2586'

Browse source 
* origin/topic/bbannier/issue-2586:
  Make dependency of `zeek` on spicy-plugin's driver object file explicit.
This commit is contained in:
Tim Wojtulewicz 2022-11-17 11:34:41 -07:00
commit a0659994f0
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
5.2.0-dev.334 | 2022-11-17 11:34:41 -0700
* Make dependency of `zeek` on spicy-plugin's driver object file explicit. (Benjamin Bannier, Corelight)
5.2.0-dev.332 | 2022-11-17 11:31:23 -0700
* Spelling NEWS & CMakeLists.txt (Josh Soref)

4
CMakeLists.txt
View file

@ -863,6 +863,10 @@ CheckOptionalBuildSources(auxil/zeek-archiver ZeekArchiver INSTALL_ZEEK_ARCHIVER
CheckOptionalBuildSources(auxil/zeek-client ZeekClient INSTALL_ZEEK_CLIENT)
if ( NOT DISABLE_SPICY )
# The `zeek` binary implicitly depends on the driver object file built
# as part of `spicy`; make that dependency explicit.
add_dependencies(zeek spicyz)
if ( NOT SPICY_ROOT_DIR )
list(APPEND _spicy_rt_libs spicy-rt hilti-rt)

2
VERSION
View file

@ -1 +1 @@
5.2.0-dev.332
5.2.0-dev.334