diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-03-27 20:57:51 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-03-27 20:57:51 +0000 |
| commit | 63fec1d6d4f53c480ff3db3308e0da8e029ca027 (patch) | |
| tree | 8c457b51b278855ab62a43afb7b75378462e9a63 /databases/mariadb101-server/files/patch-cmake_ssl.cmake | |
| parent | New port: multimedia/plexwatch (diff) | |
databases/mariadb101-{server,client}: Update to 10.1.13
- Update to version 10.1.13
- Make GSSAPI plugin optional [2]
- Remove patches that are merged upstream
- Re-generate patches that required fuzzing
- Server
- Fix OQGraph build failure [1]
- Install server gssapi plugin only
- Don't install gssapi libs/files that were moved to -client
- Add license and readme file for TokuDB
- Add tokuft_logprint and tokuftdump binaries
- Client
- Install client gssapi plugin
- Enable PLIST_SUB for optional gssapi plugin
- Add new plugins and ini file
- Remove taocrypt patch, we don't build bundled SSL
PR: 207675 [1], 207883 [2]
Reviewed by: feld (mentor)
Approved by: feld (mentor)
Differential Revision: D5751
Notes
Notes:
svn path=/head/; revision=412011
Diffstat (limited to 'databases/mariadb101-server/files/patch-cmake_ssl.cmake')
| -rw-r--r-- | databases/mariadb101-server/files/patch-cmake_ssl.cmake | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/databases/mariadb101-server/files/patch-cmake_ssl.cmake b/databases/mariadb101-server/files/patch-cmake_ssl.cmake index b1178daef4be..5f8c1c0b6910 100644 --- a/databases/mariadb101-server/files/patch-cmake_ssl.cmake +++ b/databases/mariadb101-server/files/patch-cmake_ssl.cmake @@ -1,7 +1,7 @@ MariaDB prefers static libraries, breaks builds with ports' OpenSSL libs ---- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC +--- cmake/ssl.cmake.orig 2016-03-24 09:12:10 UTC +++ cmake/ssl.cmake @@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL) @@ -16,3 +16,16 @@ ports' OpenSSL libs FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32 ssleay32MD HINTS ${OPENSSL_ROOT_DIR}/lib) +@@ -156,9 +156,9 @@ MACRO (MYSQL_CHECK_SSL) + HINTS ${OPENSSL_ROOT_DIR}/lib) + MARK_AS_ADVANCED(CRYPTO_LIBRARY OPENSSL_LIBRARIES OPENSSL_ROOT_DIR + OPENSSL_INCLUDE_DIR) +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() ++# IF (WITH_SSL_PATH) ++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) ++# ENDIF() + + INCLUDE(CheckSymbolExists) + SET(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) |