diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-08-24 18:56:34 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-08-24 18:56:34 +0000 |
| commit | b4ada7862988980c18bf2662a88a03ae40e03966 (patch) | |
| tree | dace47d487de263c7ab29b9e320413cdc1b56959 /databases | |
| parent | Upgrade to 7.0.3 (diff) | |
databases/mysql57-server: Fix build with LibreSSL
- Fix building when OPENSSL_VERSION_NUMBER == 2
- Switch USE_OPENSSL to USES= ssl
PR: 211770
Submitted by: Markus Kohlmeyer <rootservice@gmail.com>
Reported by: Markus Kohlmeyer <rootservice@gmail.com>
Approved by: Mahdi Mokhtari <mokhi64@gmail.com>
MFH: 2016Q3
Notes
Notes:
svn path=/head/; revision=420816
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/mysql57-client/files/patch-cmake_ssl.cmake | 15 | ||||
| -rw-r--r-- | databases/mysql57-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql57-server/files/patch-cmake_ssl.cmake | 15 |
3 files changed, 32 insertions, 2 deletions
diff --git a/databases/mysql57-client/files/patch-cmake_ssl.cmake b/databases/mysql57-client/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..c9a66c421b23 --- /dev/null +++ b/databases/mysql57-client/files/patch-cmake_ssl.cmake @@ -0,0 +1,15 @@ +--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC ++++ cmake/ssl.cmake +@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION STREQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSE() + SET(OPENSSL_FOUND FALSE) + ENDIF() diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index 049c698c317d..c0ea514f834f 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -17,9 +17,9 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SLAVEDIRS= databases/mysql57-client -USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib cpe libedit localbase perl5 shebangfix +USES= bison:build cmake:outsource compiler:c11 compiler:c++11-lib \ + cpe libedit localbase perl5 shebangfix ssl -USE_OPENSSL= yes USE_PERL5= run MY_DBDIR= /var/db/mysql diff --git a/databases/mysql57-server/files/patch-cmake_ssl.cmake b/databases/mysql57-server/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..c9a66c421b23 --- /dev/null +++ b/databases/mysql57-server/files/patch-cmake_ssl.cmake @@ -0,0 +1,15 @@ +--- cmake/ssl.cmake.orig 2016-08-12 10:55:07 UTC ++++ cmake/ssl.cmake +@@ -179,6 +179,12 @@ MACRO (MYSQL_CHECK_SSL) + OPENSSL_MAJOR_VERSION STREQUAL "1" + ) + SET(OPENSSL_FOUND TRUE) ++ ELSEIF(OPENSSL_INCLUDE_DIR AND ++ OPENSSL_LIBRARY AND ++ CRYPTO_LIBRARY AND ++ OPENSSL_MAJOR_VERSION STREQUAL "2" ++ ) ++ SET(OPENSSL_FOUND TRUE) + ELSE() + SET(OPENSSL_FOUND FALSE) + ENDIF() |