thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix libssh+openssl3 & s390x

Browse Source
This commit is contained in:
Boris Kuschel 2023-09-29 09:46:15 -07:00
parent 4490217aaf
commit 09c7af7fab
No known key found for this signature in database
GPG Key ID: 41F888B501034AF3
10 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/libssh-cmake/CMakeLists.txt
View File

@ -55,9 +55,6 @@ if (OS_LINUX)
elseif (ARCH_PPC64LE) elseif (ARCH_PPC64LE)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/ppc64le") target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/ppc64le")
elseif (ARCH_S390X) elseif (ARCH_S390X)
# Like ppc64le but with HAVE_OPENSSL_FIPS_MODE undefined. This is because the OpenSSL used by s390x doesn't support
# FIPS_mode(). Besides that, the custom s390x/config.h only exists to make things compile without additional ifdefs.
# With high probability, libssl with OpenSSL on s390x is broken.
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/s390x") target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/s390x")
elseif (ARCH_RISCV64) elseif (ARCH_RISCV64)
target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/riscv64") target_include_directories(_ssh PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/libssh-cmake/linux/riscv64")

2
contrib/libssh-cmake/darwin/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

2
contrib/libssh-cmake/freebsd/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

2
contrib/libssh-cmake/linux/aarch64-musl/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

2
contrib/libssh-cmake/linux/aarch64/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

2
contrib/libssh-cmake/linux/ppc64le/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

4
contrib/libssh-cmake/linux/riscv64/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
/* #undef HAVE_OPENSSL_FIPS_MODE */ #if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

8
contrib/libssh-cmake/linux/s390x/config.h
View File

@ -5,7 +5,7 @@
#define VERSION "0.9.7" #define VERSION "0.9.7"
#define SYSCONFDIR "etc" #define SYSCONFDIR "etc"
#define BINARYDIR "/home/ubuntu/workdir/ClickHouse/build/ppc64le" #define BINARYDIR "/home/ubuntu/workdir/ClickHouse/build/s390x"
#define SOURCEDIR "/home/ubuntu/workdir/ClickHouse" #define SOURCEDIR "/home/ubuntu/workdir/ClickHouse"
/* Global bind configuration file path */ /* Global bind configuration file path */
@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
/* #undef HAVE_OPENSSL_FIPS_MODE */ #if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1
@ -282,4 +284,4 @@
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */ significant byte first (like Motorola and SPARC, unlike Intel). */
/* #undef WORDS_BIGENDIAN */ #define WORDS_BIGENDIAN 1

2
contrib/libssh-cmake/linux/x86-64-musl/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1

2
contrib/libssh-cmake/linux/x86-64/config.h
View File

@ -127,7 +127,9 @@
/* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */ /* #undef HAVE_OPENSSL_EVP_KDF_CTX_NEW_ID */
/* Define to 1 if you have the `FIPS_mode' function. */ /* Define to 1 if you have the `FIPS_mode' function. */
#if USE_BORINGSSL
#define HAVE_OPENSSL_FIPS_MODE 1 #define HAVE_OPENSSL_FIPS_MODE 1
#endif
/* Define to 1 if you have the `EVP_DigestSign' function. */ /* Define to 1 if you have the `EVP_DigestSign' function. */
#define HAVE_OPENSSL_EVP_DIGESTSIGN 1 #define HAVE_OPENSSL_EVP_DIGESTSIGN 1