From 76142075262ea20e149033c6783051d094fc867d Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Sun, 3 Jan 2016 18:25:22 +0000 Subject: 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 --- .../files/patch-cmake__jemalloc.cmake | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 databases/mariadb100-client/files/patch-cmake__jemalloc.cmake (limited to 'databases/mariadb100-client/files/patch-cmake__jemalloc.cmake') 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 aea0487ba809..000000000000 --- a/databases/mariadb100-client/files/patch-cmake__jemalloc.cmake +++ /dev/null @@ -1,18 +0,0 @@ ---- cmake/jemalloc.cmake.orig 2014-09-25 00:29:47.000000000 +0200 -+++ cmake/jemalloc.cmake 2014-09-27 10:05:48.000000000 +0200 -@@ -24,12 +24,12 @@ - SET(what system) - ENDIF() - -- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) - 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() -- cgit v1.2.3