From 3c5a98e83f12927a6ecc53dff5b066eb2c6363c8 Mon Sep 17 00:00:00 2001 From: Leonardo Di Donato Date: Mon, 20 Jan 2020 12:16:27 +0000 Subject: [PATCH] update: force deps to always use the system openssl Co-authored-by: Lorenzo Fontana Signed-off-by: Leonardo Di Donato --- cmake/modules/sysdig.cmake | 3 +++ docker/builder/root/usr/bin/entrypoint | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/modules/sysdig.cmake b/cmake/modules/sysdig.cmake index 43fb131dc7e..a21dd201c38 100644 --- a/cmake/modules/sysdig.cmake +++ b/cmake/modules/sysdig.cmake @@ -43,6 +43,9 @@ add_subdirectory("${SYSDIG_SOURCE_DIR}/userspace/libscap" "${PROJECT_BINARY_DIR} add_subdirectory("${SYSDIG_SOURCE_DIR}/userspace/libsinsp" "${PROJECT_BINARY_DIR}/userspace/libsinsp") add_dependencies(sinsp tbb b64 luajit) +# explicitly force this dependency to use the system OpenSSL +set(USE_BUNDLED_OPENSSL OFF) + if(USE_BUNDLED_DEPS) add_dependencies(scap grpc curl jq) endif() diff --git a/docker/builder/root/usr/bin/entrypoint b/docker/builder/root/usr/bin/entrypoint index f930ecdacbb..fd8f8df2113 100755 --- a/docker/builder/root/usr/bin/entrypoint +++ b/docker/builder/root/usr/bin/entrypoint @@ -39,7 +39,6 @@ case "$CMD" in -DFALCO_VERSION="$FALCO_VERSION" \ -DDRAIOS_DEBUG_FLAGS="$DRAIOS_DEBUG_FLAGS" \ -DUSE_BUNDLED_DEPS=ON \ - -DUSE_BUNDLED_OPENSSL=OFF \ "$SOURCE_DIR/falco" exit "$(printf '%d\n' $?)" ;;