Skip to content

[DO not merge!!!] Experiments with dynamic OpenSSL #1141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Enmk wants to merge 3 commits into
base: antalya-25.8
Choose a base branch
from
Open

[DO not merge!!!] Experiments with dynamic OpenSSL #1141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab901e2
Allow rust dependencies to be built ENABLE_OPENSSL_DYNAMIC=1
Enmk Nov 14, 2025
cfbdd27
ENABLE_OPENSSL_DYNAMIC_DEFAULT=ON for CI/CD to use dynamic OpenSSL
Enmk Nov 14, 2025
f679da1
More fixes of building rust libraries with ENABLE_OPENSSL_DYNAMIC
Enmk Nov 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,10 @@ if (ARCH_S390X)
else ()
set(ENABLE_OPENSSL_DYNAMIC_DEFAULT OFF)
endif ()

#TODO (vnemkov): remove this before merging
set(ENABLE_OPENSSL_DYNAMIC_DEFAULT ON)

option(ENABLE_OPENSSL_DYNAMIC "This option removes SSL from ClickHouse and will link to the OpenSSL version supplied by OS." ${ENABLE_OPENSSL_DYNAMIC_DEFAULT})

# when installing to /usr - place configs to /etc but for /usr/local place to /usr/local/etc
Expand Down
12 changes: 10 additions & 2 deletions contrib/delta-kernel-rs-cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,20 @@ file(COPY ${ClickHouse_SOURCE_DIR}/contrib/openssl/include/ DESTINATION ${DELTA_
# Path for autogenerated files (`delta_kernel_ffi.hpp`)
set(DELTA_KERNEL_TARGET_PATH ${DELTA_KERNEL_RS_BINARY_DIR}/include)

set(DELTA_KERNEL_FFI_OPENSSL "OPENSSL_STATIC=1")
set(DELTA_KERNEL_FFI_OPENSSL_LIB_DIR "${CMAKE_BINARY_DIR}/contrib/openssl-cmake/")

if (ENABLE_OPENSSL_DYNAMIC)
set(DELTA_KERNEL_FFI_OPENSSL "OPENSSL_DYNAMIC=1")
set(DELTA_KERNEL_FFI_OPENSSL_LIB_DIR "${CMAKE_BINARY_DIR}/programs")
endif()

corrosion_set_env_vars(delta_kernel_ffi
"CARGO_HOME=${CMAKE_BINARY_DIR}/contrib/corrosion-cmake/"
"CARGO_TARGET_DIR=${DELTA_KERNEL_TARGET_PATH}"
"OPENSSL_LIBS=ssl:crypto"
"OPENSSL_STATIC=1"
"OPENSSL_LIB_DIR=${CMAKE_BINARY_DIR}/contrib/openssl-cmake/"
"${DELTA_KERNEL_FFI_OPENSSL}"
"OPENSSL_LIB_DIR=${DELTA_KERNEL_FFI_OPENSSL_LIB_DIR}"
"OPENSSL_INCLUDE_DIR=${DELTA_KERNEL_RS_BINARY_DIR}/${PLATFORM_DIRECTORY}")

target_include_directories(delta_kernel_ffi INTERFACE "${DELTA_KERNEL_TARGET_PATH}/")
Expand Down
Loading