diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2016-01-03 18:25:22 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2016-01-03 18:25:22 +0000 |
| commit | 76142075262ea20e149033c6783051d094fc867d (patch) | |
| tree | 653cbc95653e4a020dd038c2a37b15833aca3733 /databases/mariadb100-server/files/patch-cmake_jemalloc.cmake | |
| parent | math/jags: 3.4.0 -> 4.0.0 (diff) | |
databases/mariadb100-{client,server}: Update to 10.0.23
- Update to 10.0.23
- Re-patch files due to path change in WRKSRC
- Harmonize CONFLICTS and quench portlint warnings
- Use variables to construct INSTALL_CONFLICTS
- Fix json.cpp clang compilation issue
- Refactor and upstream jemalloc patch
Changes:
- https://mariadb.com/kb/en/mariadb/mariadb-10023-changelog/
Reviewed by: koobs (mentor), feld (mentor)
Approved by: koobs (mentor)
Differential Revision: https://reviews.freebsd.org/D4709
Notes
Notes:
svn path=/head/; revision=405181
Diffstat (limited to 'databases/mariadb100-server/files/patch-cmake_jemalloc.cmake')
| -rw-r--r-- | databases/mariadb100-server/files/patch-cmake_jemalloc.cmake | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake index ca8a8626617e..8894a2d3dbfa 100644 --- a/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake +++ b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake @@ -1,18 +1,28 @@ ---- cmake/jemalloc.cmake.orig 2015-06-17 14:54:11 UTC +Upstreamed https://github.com/MariaDB/server/pull/139 + +--- cmake/jemalloc.cmake.orig 2015-12-16 16:05:44 UTC +++ cmake/jemalloc.cmake -@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC) +@@ -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) -+ CHECK_LIBRARY_EXISTS(c 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) -- SET(LIBJEMALLOC ${libname}) -- SET(MALLOC_LIBRARY "${what} jemalloc") -+ SET(LIBJEMALLOC c) -+ SET(MALLOC_LIBRARY "system jemalloc") - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() |