diff --git a/CHANGES b/CHANGES index 04e0cf005a..b2b237db57 100644 --- a/CHANGES +++ b/CHANGES @@ -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) diff --git a/CMakeLists.txt b/CMakeLists.txt index 165ed2691d..c24b428a2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/VERSION b/VERSION index 8d5e41abd0..4a0d1c7c71 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.2.0-dev.332 +5.2.0-dev.334