CDRIVER-3493 fix libmongocrypt dep for static

Author: kevinAlbs

.evergreen/check-release-archive.sh

@@ -24,7 +24,7 @@ python build/calc_release_version.py -p > VERSION_RELEASED
 # file checks.
 mkdir cmake_build
 cd cmake_build
-$CMAKE -DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON -DENABLE_ZLIB=BUNDLED -DENABLE_BSON=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF ../
+$CMAKE -DENABLE_MAN_PAGES=ON -DENABLE_HTML_DOCS=ON -DENABLE_ZLIB=BUNDLED -DENABLE_BSON=ON ../
 make DISTCHECK_BUILD_OPTS="-j 8" distcheck
 
 # Check that docs were included, but sphinx temp files weren't.

.evergreen/compile-unix.sh

@@ -208,10 +208,6 @@ if [ "$COMPILE_LIBMONGOCRYPT" = "ON" ]; then
    $CMAKE -DENABLE_SHARED_BSON=ON -DCMAKE_BUILD_TYPE="Debug" -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DCMAKE_PREFIX_PATH="$INSTALL_DIR" ../
    make install
    cd ../../
-else
-   # Hosts may have libmongocrypt installed from apt/yum. We do not want to pick those up
-   # since those libmongocrypt packages statically link libbson.
-   CONFIGURE_FLAGS="$CONFIGURE_FLAGS -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF"
 fi
 
 if [ "$ANALYZE" = "ON" ]; then

.evergreen/config.yml

@@ -432,8 +432,14 @@ functions:
         # Hide credentials.
         set +o xtrace
         set +o errexit
-        export MONGOC_TEST_AWS_SECRET_ACCESS_KEY="${client_side_encryption_aws_secret_access_key}"
-        export MONGOC_TEST_AWS_ACCESS_KEY_ID="${client_side_encryption_aws_access_key_id}"
+        # Only set creds if testing with Client Side Encryption.
+        # libmongoc may build with CSE enabled (if the host has libmongocrypt installed)
+        # and will try to run those tests (which fail on ASAN unless spawning is bypassed).
+        if [ -n "$CLIENT_SIDE_ENCRYPTION" ]; then
+          echo "testing with CSE"
+          export MONGOC_TEST_AWS_SECRET_ACCESS_KEY="${client_side_encryption_aws_secret_access_key}"
+          export MONGOC_TEST_AWS_ACCESS_KEY_ID="${client_side_encryption_aws_access_key_id}"
+        fi
         set -o errexit
         set -o xtrace
         sh .evergreen/run-tests.sh

.evergreen/install-uninstall-check.sh

@@ -47,7 +47,7 @@ else
 fi
 
 
-$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF .
+$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_PREFIX -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $BSON_ONLY_OPTION .
 make
 if [ "$DESTDIR" ]; then
    make DESTDIR=$DESTDIR install

.evergreen/link-sample-program-bson.sh

@@ -49,11 +49,11 @@ $TAR xf ../../mongoc.tar.gz -C . --strip-components=1
 
 if [ "$LINK_STATIC" ]; then
   # Our CMake system builds shared and static by default.
-  $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF .
+  $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=ON .
   make
   make install
 else
-  $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=ON -DENABLE_STATIC=OFF -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF .
+  $CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DENABLE_TESTS=OFF -DENABLE_BSON=ON -DENABLE_STATIC=OFF .
   make
   make install
 

.evergreen/link-sample-program.sh

@@ -82,7 +82,7 @@ else
 fi
 
 
-$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_BSON=ON -DENABLE_CLIENT_SIDE_ENCRYPTION=OFF -DENABLE_ZSTD=$ZSTD .
+$CMAKE -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR -DCMAKE_PREFIX_PATH=$INSTALL_DIR/lib/cmake $SSL_CMAKE_OPTION $SNAPPY_CMAKE_OPTION $STATIC_CMAKE_OPTION -DENABLE_BSON=ON -DENABLE_ZSTD=$ZSTD .
 make
 make install
 

build/cmake/make_dist/MakeDistCheck.cmake

@@ -52,7 +52,6 @@ function (RUN_DIST_CHECK PACKAGE_PREFIX EXT)
          -D ENABLE_MAINTAINER_FLAGS=ON
          -D ENABLE_SNAPPY=AUTO
          -D ENABLE_ZLIB=BUNDLED
-         -D ENABLE_CLIENT_SIDE_ENCRYPTION=OFF
          ../${PACKAGE_PREFIX}
       WORKING_DIRECTORY ${BUILD_DIR}
       ERROR_MSG "CMake configure command failed."

build/evergreen_config_lib/functions.py

@@ -296,8 +296,14 @@
         # Hide credentials.
         set +o xtrace
         set +o errexit
-        export MONGOC_TEST_AWS_SECRET_ACCESS_KEY="${client_side_encryption_aws_secret_access_key}"
-        export MONGOC_TEST_AWS_ACCESS_KEY_ID="${client_side_encryption_aws_access_key_id}"
+        # Only set creds if testing with Client Side Encryption.
+        # libmongoc may build with CSE enabled (if the host has libmongocrypt installed)
+        # and will try to run those tests (which fail on ASAN unless spawning is bypassed).
+        if [ -n "$CLIENT_SIDE_ENCRYPTION" ]; then
+          echo "testing with CSE"
+          export MONGOC_TEST_AWS_SECRET_ACCESS_KEY="${client_side_encryption_aws_secret_access_key}"
+          export MONGOC_TEST_AWS_ACCESS_KEY_ID="${client_side_encryption_aws_access_key_id}"
+        fi
         set -o errexit
         set -o xtrace
         sh .evergreen/run-tests.sh

src/libmongoc/CMakeLists.txt

@@ -421,7 +421,9 @@ elseif (NOT ENABLE_CLIENT_SIDE_ENCRYPTION STREQUAL OFF)
 
    if (mongocrypt_FOUND)
       set (LIBMONGOCRYPT_TARGET mongo::mongocrypt)
-      get_target_property (LIBMONGOCRYPT_LIBRARY mongo::mongocrypt LOCATION)
+      get_target_property (LIBMONGOCRYPT_RUNTIME_LIBRARY mongo::mongocrypt LOCATION)
+      get_filename_component(LIBMONGOCRYPT_LIBRARY_LOCATION ${LIBMONGOCRYPT_RUNTIME_LIBRARY} DIRECTORY)
+      find_library (LIBMONGOCRYPT_LIBRARY NAMES mongocrypt PATHS ${LIBMONGOCRYPT_LIBRARY_LOCATION})
       get_target_property (LIBMONGOCRYPT_INCLUDE_DIRECTORIES mongo::mongocrypt INTERFACE_INCLUDE_DIRECTORIES)
       message ("--   libmongocrypt found at ${LIBMONGOCRYPT_LIBRARY}")
       message ("--   libmongocrypt include path ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES}")
@@ -681,11 +683,11 @@ endif ()
 
 set (LIBRARIES
    ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES}
-   ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} Threads::Threads ${ICU_LIBRARIES} ${LIBMONGOCRYPT_TARGET}
+   ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} Threads::Threads ${ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY}
 )
 set (STATIC_LIBRARIES
    ${SASL_LIBRARIES} ${SSL_LIBRARIES} ${SHM_LIBRARIES} ${RESOLV_LIBRARIES}
-   ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ICU_LIBRARIES} ${LIBMONGOCRYPT_TARGET}
+   ${SNAPPY_LIBRARIES} ${ZLIB_LIBRARIES} ${MONGOC_ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${ICU_LIBRARIES} ${LIBMONGOCRYPT_LIBRARY}
 )
 
 if (WIN32)
@@ -697,6 +699,7 @@ set_target_properties (mongoc_shared PROPERTIES CMAKE_CXX_VISIBILITY_PRESET hidd
 target_link_libraries (mongoc_shared PRIVATE ${LIBRARIES} PUBLIC ${BSON_LIBRARIES})
 target_include_directories (mongoc_shared BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS})
 target_include_directories (mongoc_shared PRIVATE ${PRIVATE_ZLIB_INCLUDES})
+target_include_directories (mongoc_shared PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES})
 target_compile_definitions (mongoc_shared PRIVATE MONGOC_COMPILATION)
 
 set_target_properties (mongoc_shared PROPERTIES VERSION 0.0.0 SOVERSION 0)
@@ -707,6 +710,7 @@ if (MONGOC_ENABLE_STATIC)
    target_link_libraries (mongoc_static ${STATIC_LIBRARIES} ${BSON_STATIC_LIBRARIES})
    target_include_directories (mongoc_static BEFORE PUBLIC ${MONGOC_INTERNAL_INCLUDE_DIRS})
    target_include_directories (mongoc_static PRIVATE ${PRIVATE_ZLIB_INCLUDES})
+   target_include_directories (mongoc_static PRIVATE ${LIBMONGOCRYPT_INCLUDE_DIRECTORIES})
    target_compile_definitions (mongoc_static
       PUBLIC MONGOC_STATIC ${BSON_STATIC_PUBLIC_DEFINITIONS}
       PRIVATE MONGOC_COMPILATION

src/libmongoc/src/mongoc/mongoc-client-side-encryption.c

@@ -1025,6 +1025,7 @@ _spawn_mongocryptd (const char *mongocryptd_spawn_path,
    bool passed_idle_shutdown_timeout_secs = false;
    int num_args = 2; /* for leading "mongocrypt" and trailing NULL */
    int i;
+   bool ret;
 
    /* iterate once to get length and validate all are strings */
    if (mongocryptd_spawn_args) {
@@ -1073,7 +1074,9 @@ _spawn_mongocryptd (const char *mongocryptd_spawn_path,
    BSON_ASSERT (i == num_args - 1);
    args[i++] = NULL;
 
-   return _do_spawn (mongocryptd_spawn_path, args, error);
+   ret = _do_spawn (mongocryptd_spawn_path, args, error);
+   bson_free (args);
+   return ret;
 }
 
 static bool