diff options
| author | brnrd <brnrd@FreeBSD.org> | 2016-02-14 06:33:53 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2016-02-14 06:33:53 +0800 |
| commit | eba53cc44159a65947b435149aaf9cfedf1a836e (patch) | |
| tree | f8d7c21ffbaabc9f938d1b36eba48ae05c8cb88e /databases/mariadb101-client | |
| parent | d125cf3fa85788510a542074a63783b4596716b0 (diff) | |
| download | freebsd-ports-gnome-eba53cc44159a65947b435149aaf9cfedf1a836e.tar.gz freebsd-ports-gnome-eba53cc44159a65947b435149aaf9cfedf1a836e.tar.zst freebsd-ports-gnome-eba53cc44159a65947b435149aaf9cfedf1a836e.zip | |
databases/mariadb101-{client,server}: Add missing patches
- Patches that were non-existent in the source of the repocopy
(mariadb100-*) were not part of the initial commit
Differential Revision: D3953
Diffstat (limited to 'databases/mariadb101-client')
| -rw-r--r-- | databases/mariadb101-client/files/patch-cmake_ssl.cmake | 18 | ||||
| -rw-r--r-- | databases/mariadb101-client/files/patch-include_mysql_service__encryption.h | 14 |
2 files changed, 32 insertions, 0 deletions
diff --git a/databases/mariadb101-client/files/patch-cmake_ssl.cmake b/databases/mariadb101-client/files/patch-cmake_ssl.cmake new file mode 100644 index 000000000000..b1178daef4be --- /dev/null +++ b/databases/mariadb101-client/files/patch-cmake_ssl.cmake @@ -0,0 +1,18 @@ +MariaDB prefers static libraries, breaks builds with +ports' OpenSSL libs + +--- cmake/ssl.cmake.orig 2015-12-23 15:33:29 UTC ++++ cmake/ssl.cmake +@@ -145,9 +145,9 @@ MACRO (MYSQL_CHECK_SSL) + + # On mac this list is <.dylib;.so;.a> + # We prefer static libraries, so we revert it here. +- IF (WITH_SSL_PATH) +- LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) +- ENDIF() ++# IF (WITH_SSL_PATH) ++# LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES) ++# ENDIF() + FIND_LIBRARY(OPENSSL_LIBRARIES + NAMES ssl ssleay32 ssleay32MD + HINTS ${OPENSSL_ROOT_DIR}/lib) diff --git a/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h new file mode 100644 index 000000000000..ae94c3c0c38d --- /dev/null +++ b/databases/mariadb101-client/files/patch-include_mysql_service__encryption.h @@ -0,0 +1,14 @@ +--- include/mysql/service_encryption.h.orig 2015-12-23 15:33:29 UTC ++++ include/mysql/service_encryption.h +@@ -37,9 +37,11 @@ extern "C" { + #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) + #include <stdlib.h> + #else ++#ifndef __FreeBSD__ + #include <alloca.h> + #endif + #endif ++#endif + + /* returned from encryption_key_get_latest_version() */ + #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0) |