diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /databases/mysql94-server/files/patch-cmake_ssl.cmake | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'databases/mysql94-server/files/patch-cmake_ssl.cmake')
| -rw-r--r-- | databases/mysql94-server/files/patch-cmake_ssl.cmake | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/databases/mysql94-server/files/patch-cmake_ssl.cmake b/databases/mysql94-server/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..41c725984ec3 --- /dev/null +++ b/databases/mysql94-server/files/patch-cmake_ssl.cmake @@ -0,0 +1,25 @@ +--- cmake/ssl.cmake.orig 2024-04-10 06:26:28 UTC ++++ cmake/ssl.cmake +@@ -156,7 +156,7 @@ MACRO(FIND_OPENSSL_VERSION) + # Encoded as MNNFFPPS: major minor fix patch status + FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" + OPENSSL_VERSION_NUMBER +- REGEX "^#[ ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ++ REGEX "^#[\t ]*define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" + ) + STRING(REGEX REPLACE + "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" +@@ -566,9 +566,10 @@ FUNCTION(MYSQL_CHECK_SSL) + ENDIF() + + # TODO(tdidriks): move to config.h.cmake / my_config.h +- IF("${OPENSSL_MAJOR_MINOR_FIX_VERSION}" VERSION_GREATER "1.1.0") +- ADD_DEFINITIONS(-DHAVE_TLSv13) +- ENDIF() ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) ++ #ADD_DEFINITIONS(-DHAVE_TLSv13) ++ ENDIF() + + GET_TARGET_PROPERTY(foo OpenSSL::SSL INTERFACE_INCLUDE_DIRECTORIES) + MESSAGE(STATUS "OPENSSL_INCLUDE_DIR = ${foo}") |