diff options
Diffstat (limited to 'databases/mysql-connector-c/files/patch-cmake_ssl.cmake')
| -rw-r--r-- | databases/mysql-connector-c/files/patch-cmake_ssl.cmake | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/databases/mysql-connector-c/files/patch-cmake_ssl.cmake b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake index c240d3089cda..b085b4c85afa 100644 --- a/databases/mysql-connector-c/files/patch-cmake_ssl.cmake +++ b/databases/mysql-connector-c/files/patch-cmake_ssl.cmake @@ -1,14 +1,24 @@ --- cmake/ssl.cmake.orig 2015-02-25 21:09:49 UTC +++ cmake/ssl.cmake -@@ -164,9 +164,9 @@ MACRO (MYSQL_CHECK_SSL) - # Verify version number. Version information looks like: - # #define OPENSSL_VERSION_NUMBER 0x1000103fL +@@ -166,17 +166,19 @@ MACRO (MYSQL_CHECK_SSL) # Encoded as MNNFFPPS: major minor fix patch status -- FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" -+ FILE(STRINGS "${OPENSSL_INCLUDE_DIR}/opensslv.h" + 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].*" ++ REGEX "define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x[0-9].*" ) STRING(REGEX REPLACE "^.*OPENSSL_VERSION_NUMBER[\t ]+0x([0-9]).*$" "\\1" + OPENSSL_MAJOR_VERSION "${OPENSSL_VERSION_NUMBER}" + ) + ++ # LibreSSL is allowed too + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ (OPENSSL_MAJOR_VERSION STREQUAL "1" OR ++ OPENSSL_MAJOR_VERSION STREQUAL "2") + ) + SET(OPENSSL_FOUND TRUE) + ELSE() |