diff --git a/CHANGES b/CHANGES index 77e7249656..60def85e8f 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +6.1.0-dev.287 | 2023-08-09 09:08:33 -0700 + + * Explicitly link Zeek executable against Spicy libraries in binary packaging mode. (Benjamin Bannier, Corelight) + 6.1.0-dev.284 | 2023-08-08 10:55:03 -0700 * Pass parsed file record information with ReadFile/WriteFile events (Tim Wojtulewicz, Corelight) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8e4982347..aeaa15a175 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -924,6 +924,17 @@ if (NOT DISABLE_SPICY) include(ConfigureSpicyBuild) # set some options different for building Spicy zeek_add_dependencies(spicy) + + # Explicitly link against Spicy libraries if we are packaging. Since + # Zeek's binary packaging mode still leaves `BUILD_SHARED_LIBS` set we + # cannot use the branching inside `hilti_link_libraries_in_tree` and + # instead explicitly branch on `BINARY_PACKAGING_MODE` here. + if (BINARY_PACKAGING_MODE) + hilti_link_object_libraries_in_tree(zeek_exe PRIVATE) + else () + hilti_link_libraries_in_tree(zeek_exe PRIVATE) + endif () + set(HAVE_SPICY yes) endif () diff --git a/VERSION b/VERSION index 5b800956c1..f74b5b99c7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.1.0-dev.284 +6.1.0-dev.287