databases/mysql56-server: Fix OpenSSL linking
- Force dynamic linking with OpenSSL MFH: 2017Q1
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# $FreeBSD$
|
||||
|
||||
PORTNAME= mysql
|
||||
PORTREVISION?= 0
|
||||
PORTREVISION?= 1
|
||||
PKGNAMESUFFIX= 56-client
|
||||
|
||||
COMMENT= Multithreaded SQL database (client)
|
||||
|
||||
11
databases/mysql56-client/files/patch-cmake_ssl.cmake
Normal file
11
databases/mysql56-client/files/patch-cmake_ssl.cmake
Normal 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()
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
PORTNAME?= mysql
|
||||
PORTVERSION= 5.6.35
|
||||
PORTREVISION?= 2
|
||||
PORTREVISION?= 3
|
||||
CATEGORIES= databases ipv6
|
||||
MASTER_SITES= MYSQL/MySQL-5.6
|
||||
PKGNAMESUFFIX?= 56-server
|
||||
@@ -54,6 +54,9 @@ CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \
|
||||
-DWITH_LIBEVENT=system \
|
||||
-DWITH_LZ4=system \
|
||||
-DWITH_ZLIB=system \
|
||||
-DWITH_SSL=${OPENSSLBASE} \
|
||||
-DCRYPTO_LIBRARY=${OPENSSLLIB}/libcrypto.so \
|
||||
-DOPENSSL_LIBRARY=${OPENSSLLIB}/libssl.so \
|
||||
-DINSTALL_MYSQLTESTDIR=0
|
||||
|
||||
SHEBANG_FILES= scripts/*.pl* scripts/*.sh
|
||||
@@ -129,12 +132,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
11
databases/mysql56-server/files/patch-cmake_ssl.cmake
Normal 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()
|
||||
Reference in New Issue
Block a user