Attachment 173580 Details for Bug 211770 – Fix build against LibreSSL 2.4+

[patch] Fix build against LibreSSL 2.4+

mysql57-libressl24.diff (text/plain), 1.43 KB, created by Markus Kohlmeyer on 2016-08-12 11:35:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Kohlmeyer

Created: 2016-08-12 11:35:01 UTC

Size: 1.43 KB

patch

obsolete

>diff -Naur mysql57-client/files/patch-cmake_ssl.cmake mysql57-client/files/patch-cmake_ssl.cmake
>--- mysql57-client/files/patch-cmake_ssl.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ mysql57-client/files/patch-cmake_ssl.cmake	2016-08-12 12:57:28.814090000 +0200
>@@ -0,0 +1,15 @@
>+--- cmake/ssl.cmake.orig	2016-08-12 10:55:07 UTC
>++++ cmake/ssl.cmake
>+@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL)
>+        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"
>++      )
>++      SET(OPENSSL_FOUND TRUE)
>+     ELSE()
>+       SET(OPENSSL_FOUND FALSE)
>+     ENDIF()
>diff -Naur mysql57-server/files/patch-cmake_ssl.cmake mysql57-server/files/patch-cmake_ssl.cmake
>--- mysql57-server/files/patch-cmake_ssl.cmake	1970-01-01 01:00:00.000000000 +0100
>+++ mysql57-server/files/patch-cmake_ssl.cmake	2016-08-12 12:57:28.814090000 +0200
>@@ -0,0 +1,15 @@
>+--- cmake/ssl.cmake.orig	2016-08-12 10:55:07 UTC
>++++ cmake/ssl.cmake
>+@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL)
>+        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"
>++      )
>++      SET(OPENSSL_FOUND TRUE)
>+     ELSE()
>+       SET(OPENSSL_FOUND FALSE)
>+     ENDIF()

Flags:

mmokhi: maintainer-approval+

Actions: View | Diff

Attachments on bug 211770: 173580