kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/mysql56-server: Fix build with LibreSSL

Browse source 
- Fix CMake SSL detection
  - Always set WITH_SSL=${OPENSSLBASE}

PR:		216311
Approved by:	Mahdi Moktari <mokhi64@gmail.com> (maintainer)
Differential Revision:	D9272
This commit is contained in:
Bernard Spil 2017-01-21 13:22:51 +00:00
parent a5c79238fd
commit 4fbb730f60
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=432035
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
databases/mysql56-client/files/patch-cmake_ssl.cmake Normal file
View file

@ -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()

7
databases/mysql56-server/Makefile
View file

@ -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

11
databases/mysql56-server/files/patch-cmake_ssl.cmake Normal file
View file

@ -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()