diff options
Diffstat (limited to 'databases/mariadb55-client/files')
3 files changed, 42 insertions, 19 deletions
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt index 82d2cd9c3421..161956baa4bd 100644 --- a/databases/mariadb55-client/files/patch-CMakeLists.txt +++ b/databases/mariadb55-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-01-29 16:12:48.000000000 +0200 -+++ CMakeLists.txt 2013-02-01 20:09:31.000000000 +0200 -@@ -303,28 +303,8 @@ +--- CMakeLists.txt.orig 2013-09-20 01:34:26.000000000 +0300 ++++ CMakeLists.txt 2013-09-27 01:30:14.000000000 +0300 +@@ -306,28 +306,8 @@ ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(libservices) ADD_SUBDIRECTORY(scripts) @@ -29,17 +29,25 @@ IF(UNIX) ADD_SUBDIRECTORY(man) ENDIF() -@@ -362,6 +342,7 @@ +@@ -339,7 +319,6 @@ + ADD_SUBDIRECTORY(win/upgrade_wizard) + ADD_SUBDIRECTORY(win/packaging) + ENDIF() +-ADD_SUBDIRECTORY(packaging/solaris) + + CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) + CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) +@@ -366,6 +345,7 @@ WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +IF(FALSE) - INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} - COMPONENT Readme -@@ -372,6 +353,7 @@ + INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER + COMPONENT Readme) + INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC +@@ -373,6 +353,7 @@ IF(UNIX) - INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) + INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) ENDIF() +ENDIF() diff --git a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake b/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake new file mode 100644 index 000000000000..e34110399130 --- /dev/null +++ b/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake @@ -0,0 +1,14 @@ +--- cmake/jemalloc.cmake.orig 2013-09-20 00:34:22.000000000 +0200 ++++ cmake/jemalloc.cmake 2013-09-27 22:46:05.791110010 +0200 +@@ -37,9 +37,9 @@ + SET(WITH_JEMALLOC "no") + ENDIF() + IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes") +- CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC) ++ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) + IF (HAVE_JEMALLOC) +- SET(LIBJEMALLOC jemalloc) ++ SET(LIBJEMALLOC c) + ELSEIF (WITH_JEMALLOC STREQUAL "system") + MESSAGE(FATAL_ERROR "system jemalloc is not found") + ELSEIF (WITH_JEMALLOC STREQUAL "yes") diff --git a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake index dd8947d72dbd..5089f861f0ba 100644 --- a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake +++ b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake @@ -1,15 +1,16 @@ ---- cmake/os/FreeBSD.cmake.orig 2013-01-13 02:13:17.000000000 +0200 -+++ cmake/os/FreeBSD.cmake 2013-01-13 02:14:15.000000000 +0200 -@@ -24,6 +24,7 @@ +--- cmake/os/FreeBSD.cmake.orig 2013-09-27 00:09:44.000000000 +0300 ++++ cmake/os/FreeBSD.cmake 2013-09-27 00:09:57.000000000 +0300 +@@ -24,9 +24,10 @@ # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH) # Find libexecinfo (library that contains backtrace_symbols etc) -+IF(FALSE) - INCLUDE_DIRECTORIES(/usr/local/include) - SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include ) - SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib") -@@ -31,6 +32,7 @@ +-INCLUDE_DIRECTORIES(/usr/local/include) +-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include ) +-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib") ++SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header") ++INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include) ++SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include) ++SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib") + FIND_LIBRARY(EXECINFO NAMES execinfo) IF(EXECINFO) SET(LIBEXECINFO ${EXECINFO}) - ENDIF() -+ENDIF() |