diff options
author | Bernard Spil <brnrd@FreeBSD.org> | 2016-05-06 20:59:50 +0000 |
---|---|---|
committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-05-06 20:59:50 +0000 |
commit | 65609c67cfa04cdd526841119f31f9a35a8b0907 (patch) | |
tree | 7c4e023006e24c7907e4c9c798dea4d78740e3d9 /databases/mariadb100-client | |
parent | 76d8477ed9d806e5188478b308d2854e89929d61 (diff) | |
download | ports-65609c67cfa04cdd526841119f31f9a35a8b0907.tar.gz ports-65609c67cfa04cdd526841119f31f9a35a8b0907.zip |
Notes
Diffstat (limited to 'databases/mariadb100-client')
-rw-r--r-- | databases/mariadb100-client/files/patch-cmake_jemalloc.cmake | 28 | ||||
-rw-r--r-- | databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp | 11 |
2 files changed, 0 insertions, 39 deletions
diff --git a/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake b/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake deleted file mode 100644 index 8894a2d3dbfa..000000000000 --- a/databases/mariadb100-client/files/patch-cmake_jemalloc.cmake +++ /dev/null @@ -1,28 +0,0 @@ -Upstreamed https://github.com/MariaDB/server/pull/139 - ---- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC -+++ cmake/jemalloc.cmake -@@ -20,11 +20,21 @@ MACRO (CHECK_JEMALLOC) - SET(CMAKE_REQUIRED_LIBRARIES pthread dl m) - SET(what bundled) - ELSE() -- SET(libname jemalloc) -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND -+ CMAKE_SYSTEM_VERSION STRGREATER "10.0") -+ SET(libname c) -+ ELSE() -+ SET(libname jemalloc) -+ ENDIF() - SET(what system) - ENDIF() - -- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND -+ CMAKE_SYSTEM_VERSION STRGREATER "10.0") -+ SET(HAVE_JEMALLOC ON) -+ ELSE() -+ CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ ENDIF() - SET(CMAKE_REQUIRED_LIBRARIES) - - IF (HAVE_JEMALLOC) diff --git a/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp deleted file mode 100644 index 214edfd8834a..000000000000 --- a/databases/mariadb100-client/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2014-04-15 14:02:39.000000000 +0300 -+++ extra/yassl/taocrypt/src/integer.cpp 2014-05-16 17:00:15.000000000 +0300 -@@ -75,7 +75,7 @@ - CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( - size_type n, const void *) - { -- if (n > this->max_size()) -+ if (n > AlignedAllocator<T>::max_size()) - return 0; - if (n == 0) - return 0; |