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 branch 'better_musl_support' of https://github.com/abenson/zeek

Browse source 
* 'better_musl_support' of https://github.com/abenson/zeek:
  cmake: Make musl support more distro agnostic
This commit is contained in:
Johanna Amann 2020-06-18 20:40:59 +00:00
commit 7ae5589469
3 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.2.0-dev.796 | 2020-06-18 20:40:59 +0000
* cmake: Make musl support more distro agnostic (Andrew Benson)
3.2.0-dev.794 | 2020-06-18 20:04:06 +0000 3.2.0-dev.794 | 2020-06-18 20:04:06 +0000
* Minimize data published for expected FTP data channel analysis * Minimize data published for expected FTP data channel analysis

13
CMakeLists.txt
View file

@ -334,19 +334,12 @@ include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
# Make everyone find the highwayhash includes # Make everyone find the highwayhash includes
include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/auxil/highwayhash)
# Alpine support # Determine if libfts is external to libc, i.e. musl
if ( ${CMAKE_SYSTEM_NAME} MATCHES Linux AND EXISTS /etc/os-release ) find_package(FTS)
execute_process( if ( FTS_FOUND )
COMMAND grep -q alpine /etc/os-release
RESULT_VARIABLE os_release_alpine
)
if ( os_release_alpine EQUAL 0 )
find_package(FTS REQUIRED)
list(APPEND OPTLIBS ${FTS_LIBRARY}) list(APPEND OPTLIBS ${FTS_LIBRARY})
include_directories(BEFORE ${FTS_INCLUDE_DIR}) include_directories(BEFORE ${FTS_INCLUDE_DIR})
endif () endif ()
endif ()
set(zeekdeps ${zeekdeps} set(zeekdeps ${zeekdeps}
${BinPAC_LIBRARY} ${BinPAC_LIBRARY}

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.794 3.2.0-dev.796