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

GH-307: Build binpac as a shared lib, not static by default

Browse source
This commit is contained in:
Jon Siwek 2019-03-18 13:58:28 -07:00
parent f19db92508
commit eb9a05cd25
12 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-167 | 2019-03-18 13:58:28 -0700
* GH-307: Build binpac as a shared lib, not static by default (Jon Siwek, Corelight)
2.6-166 | 2019-03-18 11:45:35 -0700 2.6-166 | 2019-03-18 11:45:35 -0700
* Add source file path control options for Input and Intel frameworks (Christian Kreibich, Corelight) * Add source file path control options for Input and Intel frameworks (Christian Kreibich, Corelight)

12
CMakeLists.txt
View file

@ -97,7 +97,15 @@ FindRequiredPackage(ZLIB)
if (NOT BINPAC_EXE_PATH AND if (NOT BINPAC_EXE_PATH AND
EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt) EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
if ( BUILD_STATIC_BINPAC )
set(ENABLE_STATIC_ONLY true)
endif()
add_subdirectory(aux/binpac) add_subdirectory(aux/binpac)
set(ENABLE_STATIC_ONLY ${ENABLE_STATIC_ONLY_SAVED})
endif () endif ()
FindRequiredPackage(BinPAC) FindRequiredPackage(BinPAC)
@ -286,10 +294,14 @@ 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 ()
set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
if ( BUILD_STATIC_BROKER ) if ( BUILD_STATIC_BROKER )
set(ENABLE_STATIC_ONLY true) set(ENABLE_STATIC_ONLY true)
endif() endif()
add_subdirectory(aux/broker) add_subdirectory(aux/broker)
set(ENABLE_STATIC_ONLY ${ENABLE_STATIC_ONLY_SAVED})
if ( BUILD_STATIC_BROKER ) if ( BUILD_STATIC_BROKER )
set(brodeps ${brodeps} broker_static) set(brodeps ${brodeps} broker_static)

4
NEWS
View file

@ -79,6 +79,10 @@ Changed Functionality
by default. The limit can also be ignored case-by-case via the by default. The limit can also be ignored case-by-case via the
"HTTP::max_files_policy" hook. "HTTP::max_files_policy" hook.
- The binpac library is now only compiled as a shared library by default.
To revert back to compiling only a static library, there's the
``--enable-static-binpac`` configure option.
Removed Functionality Removed Functionality
--------------------- ---------------------

2
VERSION
View file

@ -1 +1 @@
2.6-166 2.6-167

2
aux/bifcl

@ -1 +1 @@
Subproject commit 7e214967f4a4416a9e4c45d58b43f569e933b365 Subproject commit 44622332fb1361383799be33e365704caacce199

2
aux/binpac

@ -1 +1 @@
Subproject commit b6cfc1243f3e63037131e214f5c64a03eaad1d00 Subproject commit bb2476465e304a00c368bd73d40cc6f734be5311

2
aux/broccoli

@ -1 +1 @@
Subproject commit 1b437de310fb137ff271018065280ee1e65d6deb Subproject commit 41841d8f64bdb062860309f7b36513212e81befa

2
aux/broctl

@ -1 +1 @@
Subproject commit 5601ca0ac31a59356bb67343cb3a66eca7386651 Subproject commit b5b2b7895f264c825d7ff4bd8a88a4d5b6c4821c

2
aux/broker

@ -1 +1 @@
Subproject commit 22560477b5d107fc75af628f67d3afe9ec211b35 Subproject commit 7d89cb7cd7213db9be59258f0f76a084d5d87879

2
aux/zeek-aux

@ -1 +1 @@
Subproject commit a95eee2a2f018f899dfe19a4f9f2425c041f05bd Subproject commit 96c787cb396a5aad2d3ea3b2087f2a1fcd6b7216

2
cmake

@ -1 +1 @@
Subproject commit ad4d2fa614390e6bb288fd2be4387a96ff3fb9e7 Subproject commit 0c1ee634a8f915e738da72c797a17aad9cb618dd

4
configure vendored
View file

@ -53,6 +53,7 @@ Usage: $0 [OPTION]... [VAR=VALUE]...
--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) --enable-static-broker build broker statically (ignored if --with-broker is specified)
--enable-static-binpac build binpac statically (ignored if --with-binpac 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
@ -227,6 +228,9 @@ while [ $# -ne 0 ]; do
--enable-static-broker) --enable-static-broker)
append_cache_entry BUILD_STATIC_BROKER BOOL true append_cache_entry BUILD_STATIC_BROKER BOOL true
;; ;;
--enable-static-binpac)
append_cache_entry BUILD_STATIC_BINPAC BOOL true
;;
--disable-broctl) --disable-broctl)
append_cache_entry INSTALL_BROCTL BOOL false append_cache_entry INSTALL_BROCTL BOOL false
;; ;;