diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2017-01-21 13:22:51 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2017-01-21 13:22:51 +0000 |
| commit | 4fbb730f60da258ea7160a10d91b0a03e6ec3433 (patch) | |
| tree | c79b3e441a009cb2b8b18d0b1d5c216d29f0c431 /databases/mysql56-server | |
| parent | Update to 0.9.6. (diff) | |
databases/mysql56-server: Fix build with LibreSSL
- Fix CMake SSL detection
- Always set WITH_SSL=${OPENSSLBASE}
PR: 216311
Approved by: Mahdi Moktari <mokhi64@gmail.com> (maintainer)
Differential Revision: D9272
Notes
Notes:
svn path=/head/; revision=432035
Diffstat (limited to 'databases/mysql56-server')
| -rw-r--r-- | databases/mysql56-server/Makefile | 7 | ||||
| -rw-r--r-- | databases/mysql56-server/files/patch-cmake_ssl.cmake | 11 |
2 files changed, 12 insertions, 6 deletions
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 725de9adaf4f..8abc3bb78166 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -54,6 +54,7 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ -DWITH_LIBEVENT=system \ -DWITH_LZ4=system \ -DWITH_ZLIB=system \ + -DWITH_SSL=${OPENSSLBASE} \ -DINSTALL_MYSQLTESTDIR=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -129,12 +130,6 @@ PERFSCHM_SUB_LIST_OFF+= PERFSCHEMRC="--skip-performance-schema" .include <bsd.port.pre.mk> -.if ${SSL_DEFAULT} == base -CMAKE_ARGS+= -DWITH_SSL=system -.else -CMAKE_ARGS+= -DWITH_SSL=${OPENSSLBASE} -.endif - post-patch: @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt diff --git a/databases/mysql56-server/files/patch-cmake_ssl.cmake b/databases/mysql56-server/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..faeed4517c4e --- /dev/null +++ b/databases/mysql56-server/files/patch-cmake_ssl.cmake @@ -0,0 +1,11 @@ +--- cmake/ssl.cmake.orig 2016-11-28 13:36:22 UTC ++++ cmake/ssl.cmake +@@ -176,7 +176,7 @@ MACRO (MYSQL_CHECK_SSL) + IF(OPENSSL_INCLUDE_DIR AND + OPENSSL_LIBRARY AND + CRYPTO_LIBRARY AND +- OPENSSL_MAJOR_VERSION STREQUAL "1" ++ OPENSSL_MAJOR_VERSION VERSION_GREATER_EQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) + ELSE() |