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-server/files/patch-cmake_jemalloc.cmake | |
parent | Cache ac_cv_sys_long_file_names conftest result (always yes) (diff) |
databases/mariadb100-{client,server}: Update to 10.0.25
- Update to latest version 10.0.25
- Fix security vulnerabilities
- Replace USE_MYSQL/WANT_MYSQL_VER with USES= mysql:100m
- Always build with SSL support, remove bundled CyaSSL
- Align INNODB engine option with upstream option name
- Mark not supported for TokuDB on i386
- Backport improvements from 10.1 port
- Replace bundled libs with ports' versions
- ENGINES options group
- TokuDB Engine
- Add upstreamed patch fixing linuxism
- Add/fix docs and license files
- Make OQGraph ignore message explicit
PR: 209318
Security: 8c2b2f11-0ebe-11e6-b55e-b499baebfeaf
Reviewed by: feld (mentor)
Approved by: feld (mentor)
Differential Revision: D6162
Notes
Notes:
svn path=/head/; revision=414725
Diffstat (limited to 'databases/mariadb100-server/files/patch-cmake_jemalloc.cmake')
-rw-r--r-- | databases/mariadb100-server/files/patch-cmake_jemalloc.cmake | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake deleted file mode 100644 index 8894a2d3dbfa..000000000000 --- a/databases/mariadb100-server/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) |