View | Details | Raw Unified | Return to bug 193539 | Differences between
and this patch

Collapse All | Expand All

(-)mariadb100-client/files/patch-CMakeLists.txt (-11 / +7 lines)
Lines 1-5 Link Here
1 
--- CMakeLists.txt.orig	2014-08-09 00:13:37.000000000 +0200
 1 
--- CMakeLists.txt.orig	2014-09-25 00:29:47.000000000 +0200
2 
+++ CMakeLists.txt	2014-09-07 14:03:01.000000000 +0200
 2 
+++ CMakeLists.txt	2014-09-27 09:57:32.000000000 +0200
3 
@@ -430,28 +430,8 @@
 3 
@@ -430,28 +430,8 @@
4 
 ADD_SUBDIRECTORY(extra)
 4 
 ADD_SUBDIRECTORY(extra)
5 
 ADD_SUBDIRECTORY(libservices)
 5 
 ADD_SUBDIRECTORY(libservices)
Lines 29-55 Link Here
29 
 IF(UNIX)
 29 
 IF(UNIX)
30 
   ADD_SUBDIRECTORY(man)
 30 
   ADD_SUBDIRECTORY(man)
31 
 ENDIF()
 31 
 ENDIF()
32 
@@ -463,10 +443,9 @@
 32 
@@ -463,7 +443,6 @@
33 
   ADD_SUBDIRECTORY(win/upgrade_wizard)
 33 
   ADD_SUBDIRECTORY(win/upgrade_wizard)
34 
   ADD_SUBDIRECTORY(win/packaging)
 34 
   ADD_SUBDIRECTORY(win/packaging)
35 
 ENDIF()
 35 
 ENDIF()
36 
-ADD_SUBDIRECTORY(packaging/solaris)
 36 
-ADD_SUBDIRECTORY(packaging/solaris)
37
37
38 
 IF(NOT CMAKE_CROSSCOMPILING)
 38 
 IF(NOT CMAKE_CROSSCOMPILING)
39 
-  SET(EXPORTED comp_err comp_sql factorial gen_lex_hash)
 39 
   SET(EXPORTED comp_err comp_sql factorial)
40 
+  SET(EXPORTED comp_err comp_sql factorial)
 40 
@@ -506,6 +485,7 @@
41 
   # minimal target to build only binaries for export
42 
   ADD_CUSTOM_TARGET(import_executables DEPENDS ${EXPORTED})
43 
   EXPORT(TARGETS ${EXPORTED} FILE ${CMAKE_BINARY_DIR}/import_executables.cmake)
44 
@@ -503,6 +482,7 @@
45 
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 41 
   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
46 
 )
 42 
 )
47
43
48 
+IF(FALSE)
 44 
+IF(FALSE)
49 
 INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
 45 
 INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
50 
                       COMPONENT Readme)
 46 
                       COMPONENT Readme)
51 
 INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
 47
52 
@@ -511,6 +491,7 @@
 48 
@@ -516,6 +496,7 @@
53 
 IF(UNIX)
 49 
 IF(UNIX)
54 
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
 50 
   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
55 
 ENDIF()
 51 
 ENDIF()
(-)mariadb100-client/files/patch-cmake__jemalloc.cmake (-10 / +14 lines)
Lines 1-14 Link Here
1 
--- cmake/jemalloc.cmake.orig	2014-08-09 00:13:47.000000000 +0200
 1 
--- cmake/jemalloc.cmake.orig	2014-09-25 00:29:47.000000000 +0200
2 
+++ cmake/jemalloc.cmake	2014-09-05 22:13:05.641456743 +0200
 2 
+++ cmake/jemalloc.cmake	2014-09-27 10:05:48.000000000 +0200
3 
@@ -50,9 +50,9 @@
 3 
@@ -24,12 +24,12 @@
4 
       SET(what system)
5 
     ENDIF()
4
6
5 
 MACRO (CHECK_JEMALLOC)
 7 
-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
6 
   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
7 
-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
8 
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
 8 
+    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
9 
     SET(CMAKE_REQUIRED_LIBRARIES)
10
9 
     IF (HAVE_JEMALLOC)
 11 
     IF (HAVE_JEMALLOC)
10 
-      SET(LIBJEMALLOC jemalloc)
 12 
-      SET(LIBJEMALLOC ${libname})
13 
-      SET(MALLOC_LIBRARY "${what} jemalloc")
11 
+      SET(LIBJEMALLOC c)
 14 
+      SET(LIBJEMALLOC c)
12 
       SET(MALLOC_LIBRARY "system jemalloc")
 15 
+      SET(MALLOC_LIBRARY "system jemalloc")
13 
     ELSEIF (WITH_JEMALLOC STREQUAL "system")
 16 
     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
14 
       MESSAGE(FATAL_ERROR "system jemalloc is not found")
 17 
       MESSAGE(FATAL_ERROR "${libname} is not found")
18 
     ENDIF()

Return to bug 193539