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

Merge remote-tracking branch 'origin/topic/johanna/static'

Browse source 
* origin/topic/johanna/static:
  Introduce --enable-static-broker configuration option.
This commit is contained in:
Jon Siwek 2018-12-10 11:16:53 -06:00
commit 1ce5a3becb
5 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
2.6-22 | 2018-12-10 11:16:53 -0600
* Introduce --enable-static-broker configuration option. (Johanna Amann)
This option builds the bundled broker (and caf) statically.
2.6-20 | 2018-12-07 16:36:35 -0600 2.6-20 | 2018-12-07 16:36:35 -0600
* Update github/download links (Jon Siwek, Corelight) * Update github/download links (Jon Siwek, Corelight)

9
CMakeLists.txt
View file

@ -271,9 +271,16 @@ if ( BROKER_ROOT_DIR )
set(brodeps ${brodeps} ${BROKER_LIBRARY} ${CAF_LIBRARIES}) set(brodeps ${brodeps} ${BROKER_LIBRARY} ${CAF_LIBRARIES})
include_directories(BEFORE ${BROKER_INCLUDE_DIR}) include_directories(BEFORE ${BROKER_INCLUDE_DIR})
else () else ()
if ( BUILD_STATIC_BROKER )
set(ENABLE_STATIC_ONLY true)
endif()
add_subdirectory(aux/broker) add_subdirectory(aux/broker)
set(brodeps ${brodeps} broker) if ( BUILD_STATIC_BROKER )
set(brodeps ${brodeps} broker_static)
else()
set(brodeps ${brodeps} broker)
endif()
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/aux/broker
${CMAKE_CURRENT_BINARY_DIR}/aux/broker) ${CMAKE_CURRENT_BINARY_DIR}/aux/broker)
endif () endif ()

2
VERSION
View file

@ -1 +1 @@
2.6-20 2.6-22

2
aux/broker

@ -1 +1 @@
Subproject commit 0e7218b4abd98530fbea54d546f7bf99535e2127 Subproject commit 63df57d44430af31da573956b639f869a339a3a8

4
configure vendored
View file

@ -52,6 +52,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--enable-perftools-debug use Google's perftools for debugging --enable-perftools-debug use Google's perftools for debugging
--enable-jemalloc link against jemalloc --enable-jemalloc link against jemalloc
--enable-broccoli build or install the Broccoli library (deprecated) --enable-broccoli build or install the Broccoli library (deprecated)
--enable-static-broker build broker statically (ignored if --with-broker is specified)
--disable-broctl don't install Broctl --disable-broctl don't install Broctl
--disable-auxtools don't build or install auxiliary tools --disable-auxtools don't build or install auxiliary tools
--disable-perftools don't try to build with Google Perftools --disable-perftools don't try to build with Google Perftools
@ -223,6 +224,9 @@ while [ $# -ne 0 ]; do
append_cache_entry DISABLE_RUBY_BINDINGS BOOL true append_cache_entry DISABLE_RUBY_BINDINGS BOOL true
append_cache_entry INSTALL_BROCCOLI BOOL yes append_cache_entry INSTALL_BROCCOLI BOOL yes
;; ;;
--enable-static-broker)
append_cache_entry BUILD_STATIC_BROKER BOOL true
;;
--disable-broctl) --disable-broctl)
append_cache_entry INSTALL_BROCTL BOOL false append_cache_entry INSTALL_BROCTL BOOL false
;; ;;