Attachment 147718 Details for Bug 193539 – Patch to upgrade -client port from 10.0.13 to 10.0.14

[patch] Patch to upgrade -client port from 10.0.13 to 10.0.14

mariadb100-client_10.0.14.patch (text/plain), 3.07 KB, created by Bernard Spil on 2014-09-27 10:30:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2014-09-27 10:30:41 UTC

Size: 3.07 KB

patch

obsolete

>diff -ruN mariadb100-client.orig/files/patch-CMakeLists.txt mariadb100-client/files/patch-CMakeLists.txt
>--- mariadb100-client.orig/files/patch-CMakeLists.txt	2014-09-07 14:03:47.000000000 +0200
>+++ mariadb100-client/files/patch-CMakeLists.txt	2014-09-27 09:58:16.000000000 +0200
>@@ -1,5 +1,5 @@
>---- CMakeLists.txt.orig	2014-08-09 00:13:37.000000000 +0200
>-+++ CMakeLists.txt	2014-09-07 14:03:01.000000000 +0200
>+--- CMakeLists.txt.orig	2014-09-25 00:29:47.000000000 +0200
>++++ CMakeLists.txt	2014-09-27 09:57:32.000000000 +0200
> @@ -430,28 +430,8 @@
>  ADD_SUBDIRECTORY(extra)
>  ADD_SUBDIRECTORY(libservices)
>@@ -29,27 +29,23 @@
>  IF(UNIX)
>    ADD_SUBDIRECTORY(man)
>  ENDIF()
>-@@ -463,10 +443,9 @@
>+@@ -463,7 +443,6 @@
>    ADD_SUBDIRECTORY(win/upgrade_wizard)
>    ADD_SUBDIRECTORY(win/packaging)
>  ENDIF()
> -ADD_SUBDIRECTORY(packaging/solaris)
>  
>  IF(NOT CMAKE_CROSSCOMPILING)
>--  SET(EXPORTED comp_err comp_sql factorial gen_lex_hash)
>-+  SET(EXPORTED comp_err comp_sql factorial)
>-   # minimal target to build only binaries for export
>-   ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
>-   EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake)
>-@@ -503,6 +482,7 @@
>+   SET(EXPORTED comp_err comp_sql factorial)
>+@@ -506,6 +485,7 @@
>    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
>  )
>  
> +IF(FALSE)
>  INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
>                        COMPONENT Readme)
>- INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
>-@@ -511,6 +491,7 @@
>+ 
>+@@ -516,6 +496,7 @@
>  IF(UNIX)
>    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
>  ENDIF()
>diff -ruN mariadb100-client.orig/files/patch-cmake__jemalloc.cmake mariadb100-client/files/patch-cmake__jemalloc.cmake
>--- mariadb100-client.orig/files/patch-cmake__jemalloc.cmake	2014-09-05 22:13:31.000000000 +0200
>+++ mariadb100-client/files/patch-cmake__jemalloc.cmake	2014-09-27 10:06:45.000000000 +0200
>@@ -1,14 +1,18 @@
>---- cmake/jemalloc.cmake.orig	2014-08-09 00:13:47.000000000 +0200
>-+++ cmake/jemalloc.cmake	2014-09-05 22:13:05.641456743 +0200
>-@@ -50,9 +50,9 @@
>+--- 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()
>  
>- MACRO (CHECK_JEMALLOC)
>-   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
>--    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
>+-    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 jemalloc)
>+-      SET(LIBJEMALLOC ${libname})
>+-      SET(MALLOC_LIBRARY "${what} jemalloc")
> +      SET(LIBJEMALLOC c)
>-       SET(MALLOC_LIBRARY "system jemalloc")
>-     ELSEIF (WITH_JEMALLOC STREQUAL "system")
>-       MESSAGE(FATAL_ERROR "system jemalloc is not found")
>++      SET(MALLOC_LIBRARY "system jemalloc")
>+     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
>+       MESSAGE(FATAL_ERROR "${libname} is not found")
>+     ENDIF()

Actions: View | Diff

Attachments on bug 193539: 147194 | 147249 | 147316 | 147317 | 147518 | 147718 | 147719 | 147720 | 147721