Page MenuHomeFreeBSD
Files F169147176

D9272.diff
No OneTemporary
Actions

D9272.diff
View Options

Index: head/databases/mysql56-client/files/patch-cmake_ssl.cmake
===================================================================
--- head/databases/mysql56-client/files/patch-cmake_ssl.cmake
+++ head/databases/mysql56-client/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()
Index: head/databases/mysql56-server/Makefile
===================================================================
--- head/databases/mysql56-server/Makefile
+++ head/databases/mysql56-server/Makefile
@@ -54,6 +54,7 @@
-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 @@
.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
Index: head/databases/mysql56-server/files/patch-cmake_ssl.cmake
===================================================================
--- head/databases/mysql56-server/files/patch-cmake_ssl.cmake
+++ head/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()

File Metadata

Mime Type
text/plain
Expires
Tue, Sep 1, 2:26 PM (13 m, 14 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37827303
Default Alt Text
D9272.diff (1 KB)

Event Timeline