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-3177'

Browse source 
* origin/topic/bbannier/issue-3177:
  Explicitly link Zeek executable against Spicy libraries in binary packaging mode.
This commit is contained in:
Tim Wojtulewicz 2023-08-09 09:08:33 -07:00
commit 4022573d48
3 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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 6.1.0-dev.284 | 2023-08-08 10:55:03 -0700
* Pass parsed file record information with ReadFile/WriteFile events (Tim Wojtulewicz, Corelight) * Pass parsed file record information with ReadFile/WriteFile events (Tim Wojtulewicz, Corelight)

11
CMakeLists.txt
View file

@ -924,6 +924,17 @@ if (NOT DISABLE_SPICY)
include(ConfigureSpicyBuild) # set some options different for building Spicy include(ConfigureSpicyBuild) # set some options different for building Spicy
zeek_add_dependencies(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) set(HAVE_SPICY yes)
endif () endif ()

2
VERSION
View file

@ -1 +1 @@
6.1.0-dev.284 6.1.0-dev.287