diff options
| author | antoine <antoine@FreeBSD.org> | 2017-01-22 01:40:07 +0800 |
|---|---|---|
| committer | antoine <antoine@FreeBSD.org> | 2017-01-22 01:40:07 +0800 |
| commit | 7327f39fa486027ac4721680883138f2213685a5 (patch) | |
| tree | 138541d8857f372ca7a4bdeafde55018dfd14934 /databases | |
| parent | 6d527efc616c60ac7ba5a15d22aed7e5536041a7 (diff) | |
| download | freebsd-ports-gnome-7327f39fa486027ac4721680883138f2213685a5.tar.gz freebsd-ports-gnome-7327f39fa486027ac4721680883138f2213685a5.tar.zst freebsd-ports-gnome-7327f39fa486027ac4721680883138f2213685a5.zip | |
Revert r432035 part 2, it breaks build with openssl from base
With hat: portmgr
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql56-server/Makefile | 7 | ||||
| -rw-r--r-- | databases/mysql56-server/files/patch-cmake_ssl.cmake | 11 |
2 files changed, 6 insertions, 12 deletions
diff --git a/databases/mysql56-server/Makefile b/databases/mysql56-server/Makefile index 8abc3bb78166..725de9adaf4f 100644 --- a/databases/mysql56-server/Makefile +++ b/databases/mysql56-server/Makefile @@ -54,7 +54,6 @@ 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 @@ -130,6 +129,12 @@ 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 deleted file mode 100644 index faeed4517c4e..000000000000 --- a/databases/mysql56-server/files/patch-cmake_ssl.cmake +++ /dev/null @@ -1,11 +0,0 @@ ---- 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() |