Merge branch 'master' of https://github.com/ffontaine/zeek

- Also removed the setting of BinPAC_ROOT_DIR in the configure script's --with-binpac= option as that breaks the cross-compilation use-case * 'master' of https://github.com/ffontaine/zeek: CMakeLists.txt: fix cross-compilation with binpac
zeek · Feb 3, 2020 · d33613c · d33613c
2 parents 1e2dd44 + 63344b3
commit d33613c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,4 +1,8 @@
 
+3.1.0-dev.529 | 2020-02-03 13:04:30 -0800
+
+  * CMakeLists.txt: fix cross-compilation with binpac (Fabrice Fontaine)
+
 3.1.0-dev.527 | 2020-02-03 10:11:00 -0800
 
   * Change requested memory in Cirrus CI config (Jon Siwek, Corelight)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -178,8 +178,7 @@ FindRequiredPackage(OpenSSL)
 FindRequiredPackage(BIND)
 FindRequiredPackage(ZLIB)
 
-if (NOT BINPAC_EXE_PATH AND
-    EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
+if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
 
     set(ENABLE_STATIC_ONLY_SAVED ${ENABLE_STATIC_ONLY})
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.1.0-dev.527
+3.1.0-dev.529
diff --git a/configure b/configure
@@ -279,7 +279,6 @@ while [ $# -ne 0 ]; do
             ;;
         --with-binpac=*)
             append_cache_entry BINPAC_EXE_PATH     PATH $optarg
-            append_cache_entry BinPAC_ROOT_DIR     PATH "$(dirname $optarg)/.."
             ;;
         --with-bifcl=*)
             append_cache_entry BIFCL_EXE_PATH      PATH   $optarg