thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-28 18:42:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix glibc compat

Browse Source
This commit is contained in:
BoloniniD 2022-08-16 20:30:05 +03:00 committed by BoloniniD
parent 1691a8b3f5
commit eba479101a
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/BLAKE3/Cargo.toml
View File

@ -7,7 +7,7 @@ build = "build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
blake3 = "1.3.*" blake3 = "1.2.*"
[lib] [lib]
crate-type = ["staticlib"] crate-type = ["staticlib"]

3
contrib/BLAKE3/build_rust_lib.cmake
View File

@ -7,6 +7,7 @@ function(build_cargo target_name project_dir)
set(compile_message "${compile_message} in release mode") set(compile_message "${compile_message} in release mode")
endif() endif()
execute_process(COMMAND rustup target add x86_64-unknown-linux-musl)
set(TARGET_SPEC "x86_64-unknown-linux-musl") set(TARGET_SPEC "x86_64-unknown-linux-musl")
message("Initializing Rust toolchain, default is ${TARGET_SPEC}") message("Initializing Rust toolchain, default is ${TARGET_SPEC}")
@ -67,7 +68,7 @@ function(build_cargo target_name project_dir)
add_custom_command( add_custom_command(
COMMENT ${compile_message} COMMENT ${compile_message}
COMMAND export BUILD_FOR_OSX=${OSX_RUST_ROOT} COMMAND export BUILD_FOR_OSX=${OSX_RUST_ROOT}
COMMAND env CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR} cargo build ${CARGO_RELEASE_FLAG} ${TARGET_SPEC} COMMAND env CARGO_TARGET_DIR=${CMAKE_CURRENT_BINARY_DIR} cargo rustc ${CARGO_RELEASE_FLAG} ${TARGET_SPEC} -l dylib=../sysroot/linux-x86_64/x86_64-linux-gnu/libc/usr/lib64/libc.so
COMMAND cp ${output_library} ${CMAKE_CURRENT_BINARY_DIR} COMMAND cp ${output_library} ${CMAKE_CURRENT_BINARY_DIR}
COMMAND cat ./include/blake3.h COMMAND cat ./include/blake3.h
OUTPUT ${output_library} OUTPUT ${output_library}

2
contrib/boringssl vendored

@ -1 +1 @@
Subproject commit c1e01a441d6db234f4f12e63a7657d1f9e6db9c1 Subproject commit 8061ac62d67953e61b793042e33baf1352e67510

2
contrib/krb5 vendored

@ -1 +1 @@
Subproject commit 5149dea4e2be0f67707383d2682b897c14631374 Subproject commit d879821c7a4c70b0c3ad739d9951d1a2b1903df7