Differential D3953 Diff 11842 databases/mariadb101-client/files/patch-cmake_jemalloc.cmake

Changeset View

Standalone View

Property	Old Value	New Value
fbsd:nokeywords	null	yes \ No newline at end of property
svn:eol-style	null	native \ No newline at end of property
svn:mime-type	null	text/plain \ No newline at end of property

				--- cmake/jemalloc.cmake.orig 2015-10-15 15:43:36 UTC
				+++ cmake/jemalloc.cmake
				@@ -14,7 +14,7 @@ ENDMACRO()
				MACRO(JEMALLOC_TRY_DYNAMIC)
				SET(libname jemalloc)
				SET(what system)
				- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC)
				+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_DYNAMIC_JEMALLOC)
				ENDMACRO()

				MACRO (CHECK_JEMALLOC)
				@@ -37,8 +37,8 @@ MACRO (CHECK_JEMALLOC)

				IF (libname)
				IF (HAVE_DYNAMIC_JEMALLOC OR HAVE_STATIC_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")
				koobsUnsubmitted Done Inline Actions Can these be overridden using CMake arguments / environment variables instead of patches? koobs: Can these be overridden using CMake arguments / environment variables instead of patches?
				brnrdAuthorUnsubmitted Not Done Inline Actions Refactored patch and submitted it upstream brnrd: Refactored patch and [[ https://github.com/MariaDB/server/pull/140 \| submitted it upstream ]]
				ENDIF()
				brnrdAuthorUnsubmitted Not Done Inline Actions Not at the moment. jemalloc is in base in FreeBSD and the MariaDB doesn't detect that correctly brnrd: Not at the moment. jemalloc is in base in FreeBSD and the MariaDB doesn't detect that correctly