diff options
Diffstat (limited to 'databases/mysql57-client/files/patch-cmake_ssl.cmake')
| -rw-r--r-- | databases/mysql57-client/files/patch-cmake_ssl.cmake | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/databases/mysql57-client/files/patch-cmake_ssl.cmake b/databases/mysql57-client/files/patch-cmake_ssl.cmake index 86b87154ff49..0e70d693a90d 100644 --- a/databases/mysql57-client/files/patch-cmake_ssl.cmake +++ b/databases/mysql57-client/files/patch-cmake_ssl.cmake @@ -1,5 +1,5 @@ ---- cmake/ssl.cmake.orig 2020-07-08 22:29:14.999896000 +0200 -+++ cmake/ssl.cmake 2020-07-08 22:44:05.251931000 +0200 +--- cmake/ssl.cmake.orig 2019-12-06 10:41:47 UTC ++++ cmake/ssl.cmake @@ -150,22 +150,12 @@ MACRO (MYSQL_CHECK_SSL) MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}") ENDIF() @@ -23,26 +23,32 @@ IF(OPENSSL_INCLUDE_DIR) # Verify version number. Version information looks like: -@@ -193,7 +183,8 @@ MACRO (MYSQL_CHECK_SSL) +@@ -193,9 +183,10 @@ MACRO (MYSQL_CHECK_SSL) ) SET(OPENSSL_VERSION ${OPENSSL_VERSION} CACHE INTERNAL "") - IF("${OPENSSL_VERSION}" VERSION_GREATER "1.1.0") -+ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) -+ IF(HAVE_TLS1_3_VERSION) - ADD_DEFINITIONS(-DHAVE_TLSv13) - SET(HAVE_TLSv13 1) +- ADD_DEFINITIONS(-DHAVE_TLSv13) +- SET(HAVE_TLSv13 1) ++ CHECK_SYMBOL_EXISTS(TLS1_3_VERSION "openssl/tls1.h" HAVE_TLS1_3_VERSION) ++ IF(HAVE_TLS1_3_VERSION) ++ #ADD_DEFINITIONS(-DHAVE_TLSv13) ++ #SET(HAVE_TLSv13 1) IF(SOLARIS) -@@ -204,6 +195,12 @@ MACRO (MYSQL_CHECK_SSL) + SET(FORCE_SSL_SOLARIS "-Wl,--undefined,address_of_sk_new_null") + ENDIF() +@@ -203,7 +204,13 @@ MACRO (MYSQL_CHECK_SSL) + IF(OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARY AND CRYPTO_LIBRARY AND - OPENSSL_MAJOR_VERSION STREQUAL "1" -+ ) -+ SET(OPENSSL_FOUND TRUE) -+ ELSEIF(OPENSSL_INCLUDE_DIR AND -+ OPENSSL_LIBRARY AND -+ CRYPTO_LIBRARY AND -+ OPENSSL_MAJOR_VERSION STREQUAL "2" +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" ++ ) ++ SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ) SET(OPENSSL_FOUND TRUE) ELSE() |