CDRIVER-3452 list zstd as dep for static build

libzstd was not listed as a library dependency for
static libmongoc build, causing potentialy linker
errors in consumers.

Also enable zstd tests on macOS, disable on Ubuntu
since installed zstd is too old.

Author: kevinAlbs

.evergreen/compile-unix.sh

@@ -19,11 +19,12 @@ set -o errexit  # Exit the script with error if any of the commands fail
 #       LIBBSON                 Build against bundled or external libbson
 #       EXTRA_CONFIGURE_FLAGS   Extra configure flags to use
 #       ZLIB                    Build against bundled or external zlib, or none
-#       SNAPPY                  Build against bundled or external Snappy, or none
+#       SNAPPY                  Build against Snappy, or none
 #       SSL                     Build against OpenSSL or native or none
 #       SASL                    Build against SASL or not
 #       SRV                     Whether to enable SRV: ON or OFF
 #       ENABLE_SHM_COUNTERS     Build with SHM counters
+#       ZSTD                    Build against system zstd.
 
 # Options for this script.
 RELEASE=${RELEASE:-OFF}
@@ -54,6 +55,7 @@ echo "ANALYZE: $ANALYZE"
 echo "COVERAGE: $COVERAGE"
 echo "SKIP_TESTS: $SKIP_TESTS"
 echo "ZLIB: $ZLIB"
+echo "ZSTD: $ZSTD"
 
 # Get the kernel name, lowercased
 OS=$(uname -s | tr '[:upper:]' '[:lower:]')
@@ -87,6 +89,10 @@ if [ ! -z "$SNAPPY" ]; then
    DEBUG_AND_RELEASE_FLAGS="$DEBUG_AND_RELEASE_FLAGS -DENABLE_SNAPPY=${SNAPPY}"
 fi
 
+if [ ! -z "$ZSTD" ]; then
+   DEBUG_AND_RELEASE_FLAGS="$DEBUG_AND_RELEASE_FLAGS -DENABLE_ZSTD=${ZSTD}"
+fi
+
 DEBUG_FLAGS="${DEBUG_AND_RELEASE_FLAGS} -DCMAKE_BUILD_TYPE=Debug"
 RELEASE_FLAGS="${DEBUG_AND_RELEASE_FLAGS} -DCMAKE_BUILD_TYPE=RelWithDebInfo"
 

build/evergreen_config_lib/variants.py

@@ -191,7 +191,6 @@ def android(abi):
             'clang 3.8 (Ubuntu 16.04)',
             'ubuntu1604-test',
             ['.compression !.zstd',
-             'debug-compile-compression-zstd',
              'debug-compile-scan-build',
              'debug-compile-asan-clang',
              'debug-compile-ubsan',
@@ -317,7 +316,7 @@ def android(abi):
     Variant('darwin',
             '*Darwin, macOS (Apple LLVM)',
             'macos-1012',
-            ['.compression !.snappy !.zstd',
+            ['.compression !.snappy',
              'debug-compile-coverage',
              'release-compile',
              'debug-compile-nosasl-nossl',

src/libmongoc/CMakeLists.txt

@@ -116,13 +116,12 @@ if (NOT ENABLE_ZSTD STREQUAL OFF)
          message (STATUS "Detected zstd version ${ZSTD_VERSION} but version 0.8.0 required")
       endif ()
    else ()
-      message (STATUS "  Found in ${ZSTD_INCLUDE_DIRS}")
+      message (STATUS "  Found zstd version ${ZSTD_VERSION} in ${ZSTD_INCLUDE_DIRS}")
       set (MONGOC_ENABLE_COMPRESSION 1)
       set (MONGOC_ENABLE_COMPRESSION_ZSTD 1)
-      set (MONGOC_INTERNAL_INCLUDE_DIRS ${MONGOC_INTERNAL_INCLUDE_DIRS} ${ZSTD_INCLUDE_DIRS})
 
+      include_directories (${ZSTD_INCLUDE_DIRS})
       if (${CMAKE_VERSION} VERSION_LESS "3.12.0")
-         link_directories(${ZSTD_LIBRARY_DIRS})
          set (MONGOC_ZSTD_LIBRARIES ${ZSTD_LIBRARIES})
       else ()
          set (MONGOC_ZSTD_LIBRARIES ${ZSTD_LINK_LIBRARIES})
@@ -961,7 +960,7 @@ set (libdir "\${prefix}/lib")
 foreach (
       FLAG
       ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES}
-      ${THREAD_LIB} ${ZLIB_LIBRARIES} ${SNAPPY_LIBRARIES} ${ZSTD_LINK_LIBRARIES} ${ICU_LIBRARIES})
+      ${THREAD_LIB} ${ZLIB_LIBRARIES} ${SNAPPY_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${ICU_LIBRARIES})
 
    if (IS_ABSOLUTE "${FLAG}")
       get_filename_component (FLAG_DIR "${FLAG}" DIRECTORY)

src/libmongoc/build/cmake/libmongoc-1.0-config.cmake.in

@@ -37,7 +37,7 @@ set (MONGOC_LIBRARIES ${MONGOC_LIBRARY} ${BSON_LIBRARIES})
 set (IS_FRAMEWORK_VAR 0)
 foreach (LIB
    @SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIBRARIES@ @RESOLV_LIBRARIES@
-   @SNAPPY_LIBRARIES@ @ICU_LIBRARIES@
+   @SNAPPY_LIBRARIES@ @ICU_LIBRARIES@ @MONGOC_ZSTD_LIBRARIES@
 )
    if (LIB STREQUAL "-framework")
       set (IS_FRAMEWORK_VAR 1)

src/libmongoc/build/cmake/libmongoc-static-1.0-config.cmake.in

@@ -41,7 +41,7 @@ set (MONGOC_STATIC_LIBRARIES ${MONGOC_STATIC_LIBRARY} ${ZLIB_STATIC_LIBRARY} ${B
 # like "-framework CoreFoundation;-framework Security".
 set (IS_FRAMEWORK_VAR 0)
 foreach (LIB @SASL_LIBRARIES@ @SSL_LIBRARIES@ @SHM_LIBRARIES@ @ZLIB_LIBRARIES@
-   @SNAPPY_LIBRARIES@ @RESOLV_LIBRARIES@ @ICU_LIBRARIES@
+   @SNAPPY_LIBRARIES@ @RESOLV_LIBRARIES@ @ICU_LIBRARIES@ @MONGOC_ZSTD_LIBRARIES@
 )
    if (LIB STREQUAL "-framework")
       set (IS_FRAMEWORK_VAR 1)