Attachment #148408 for bug #194434

Lines 1-5 Link Here

(-)mariadb55-client/files/patch-CMakeLists.txt (-4 / +4 lines)
1	--- CMakeLists.txt.orig 2014-08-08 03:08:33.378366450 +0300	1	--- CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200
2	+++ CMakeLists.txt 2014-08-08 03:10:04.225360039 +0300	2	+++ CMakeLists.txt 2014-10-17 21:36:43.000000000 +0200
3	@@ -411,28 +411,8 @@	3	@@ -411,28 +411,8 @@
4	ADD_SUBDIRECTORY(extra)	4	ADD_SUBDIRECTORY(extra)
5	ADD_SUBDIRECTORY(libservices)	5	ADD_SUBDIRECTORY(libservices)
Lines 44-51 Link Here
44	+IF(FALSE)	44	+IF(FALSE)
45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT	45	INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
46	COMPONENT Readme)	46	COMPONENT Readme)
47	INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC	47
48	@@ -484,6 +464,7 @@	48	@@ -487,6 +467,7 @@
49	IF(UNIX)	49	IF(UNIX)
50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)	50	INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
51	ENDIF()	51	ENDIF()




--- 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")




--- cmake/jemalloc.cmake.orig	2014-10-08 15:19:51.000000000 +0200
+++ cmake/jemalloc.cmake	2014-10-17 22:20:23.000000000 +0200
@@ -22,11 +22,11 @@
       SET(libname jemalloc)
     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(LIBJEMALLOC c)
     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
       MESSAGE(FATAL_ERROR "${libname} is not found")
     ENDIF()

Lines 1-7 Link Here

(-)mariadb55-client/files/patch-libservices_CMakeLists.txt (-4 / +4 lines)
1	--- libservices/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200	1	--- libservices/CMakeLists.txt.orig 2014-10-08 15:19:52.000000000 +0200
2	+++ libservices/CMakeLists.txt 2012-12-23 17:32:35.000000000 +0200	2	+++ libservices/CMakeLists.txt 2014-10-17 21:47:48.000000000 +0200
3	@@ -24,4 +24,6 @@	3	@@ -26,4 +26,6 @@
4	debug_sync_service.c)	4	logger_service.c)
5		5
6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})	6	ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
7	+IF(FALSE)	7	+IF(FALSE)




--- scripts/CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
+++ scripts/CMakeLists.txt	2014-10-17 22:44:55.000000000 +0200
@@ -72,6 +72,7 @@
 )
 ENDIF()
 
+IF(FALSE)
 INSTALL(FILES 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
@@ -81,6 +82,7 @@
   ${FIX_PRIVILEGES_SQL}
   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
 )
+ENDIF()
 
 # TCMalloc hacks
 IF(MALLOC_LIB)
@@ -140,6 +142,7 @@
 SET(HOSTNAME "hostname")
 SET(MYSQLD_USER "mysql")
 
+IF(FALSE)
 # Required for mysqlbug until autotools are deprecated, once done remove these
 # and expand default cmake variables
 SET(CC ${CMAKE_C_COMPILER})
@@ -180,6 +183,7 @@
   DESTINATION ${INSTALL_BINDIR}
   COMPONENT Server
   )
+ENDIF()
 
 ENDIF(UNIX)
 
@@ -204,6 +208,7 @@
   SET(localstatedir ${MYSQL_DATADIR})
 ENDIF()
 
+IF()
 IF(UNIX)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
@@ -219,6 +224,7 @@
   COMPONENT Server
   )
 ENDIF()
+ENDIF()
     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
   ENDIF()
+  ENDIF()
 
 SET(prefix "${CMAKE_INSTALL_PREFIX}")
 SET(sysconfdir ${prefix})
@@ -335,18 +341,8 @@
   SET(BIN_SCRIPTS
     msql2mysql
     mysql_config
-    mysql_fix_extensions
-    mysql_setpermission
-    mysql_secure_installation
-    mysql_zap
     mysqlaccess
-    mysql_convert_table_format
     mysql_find_rows
-    mytop
-    mysqlhotcopy
-    mysqldumpslow
-    mysqld_multi
-    mysqld_safe
   )
   FOREACH(file ${BIN_SCRIPTS})
     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
@@ -386,4 +382,3 @@
     COMPONENT Development)
   ENDIF()
 ENDIF()
-

Lines 1-6 Link Here

(-)mariadb55-client/files/patch-scripts_mysql_config.sh (-3 / +3 lines)
1	--- scripts/mysql_config.sh.orig 2014-04-15 14:02:39.000000000 +0300	1	--- scripts/mysql_config.sh.orig 2014-10-17 21:44:16.000000000 +0200
2	+++ scripts/mysql_config.sh 2014-05-16 19:08:41.000000000 +0300	2	+++ scripts/mysql_config.sh 2014-10-17 21:54:16.000000000 +0200
3	@@ -108,8 +108,11 @@	3	@@ -109,8 +109,11 @@
4	# We intentionally add a space to the beginning and end of lib strings, simplifies replace later	4	# We intentionally add a space to the beginning and end of lib strings, simplifies replace later
5	libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"	5	libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
6	libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "	6	libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "




--- support-files/CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
+++ support-files/CMakeLists.txt	2014-10-17 22:34:28.000000000 +0200
@@ -41,15 +41,18 @@
   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
 ENDIF()

   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
@@ -69,8 +72,10 @@
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
   ENDIF()

   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
   
@@ -94,6 +99,7 @@
     DESTINATION ${inst_location} COMPONENT SupportFiles
     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+  ENDIF()
 
   IF (INSTALL_SYSCONFDIR)
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
@@ -101,6 +107,7 @@
             RENAME mysql COMPONENT SupportFiles
             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ ENDIF()
 
     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
             COMPONENT Common)




--- 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")

Return to bug 194434

Lines 1-14 Link Here

(-)mariadb55-client/files/patch-cmake__jemalloc.cmake (-14 lines)
1	--- cmake/jemalloc.cmake.orig 2013-09-20 00:34:22.000000000 +0200
2	+++ cmake/jemalloc.cmake 2013-09-27 22:46:05.791110010 +0200
3	@@ -37,9 +37,9 @@
4	SET(WITH_JEMALLOC "no")
5	ENDIF()
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)
9	IF (HAVE_JEMALLOC)
10	- SET(LIBJEMALLOC jemalloc)
11	+ SET(LIBJEMALLOC c)
12	ELSEIF (WITH_JEMALLOC STREQUAL "system")
13	MESSAGE(FATAL_ERROR "system jemalloc is not found")
14	ELSEIF (WITH_JEMALLOC STREQUAL "yes")

Line 0 Link Here

(-)mariadb55-client/files/patch-cmake_jemalloc.cmake (+16 lines)
	1	--- cmake/jemalloc.cmake.orig 2014-10-08 15:19:51.000000000 +0200
	2	+++ cmake/jemalloc.cmake 2014-10-17 22:20:23.000000000 +0200
	3	@@ -22,11 +22,11 @@
	4	SET(libname jemalloc)
	5	ENDIF()
	6
	7	- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
	8	+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
	9	SET(CMAKE_REQUIRED_LIBRARIES)
	10
	11	IF (HAVE_JEMALLOC)
	12	- SET(LIBJEMALLOC ${libname})
	13	+ SET(LIBJEMALLOC c)
	14	ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
	15	MESSAGE(FATAL_ERROR "${libname} is not found")
	16	ENDIF()

Lines 1-49 Link Here

(-)mariadb55-client/files/patch-scripts_CMakeLists.txt (-42 / +67 lines)
1	--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300	1	--- scripts/CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200
2	+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300	2	+++ scripts/CMakeLists.txt 2014-10-17 22:44:55.000000000 +0200
3	@@ -41,15 +41,18 @@	3	@@ -72,6 +72,7 @@
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	)
5	ENDIF()	5	ENDIF()
6		6
7	+IF(FALSE)	7	+IF(FALSE)
8	FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)	8	INSTALL(FILES
9	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh	9	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
10	${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)	10	${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
11	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}	11	@@ -81,6 +82,7 @@
12	DESTINATION ${inst_location} COMPONENT IniFiles)	12	${FIX_PRIVILEGES_SQL}
13	ENDFOREACH()	13	DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
		14	)
14	+ENDIF()	15	+ENDIF()
15		16
		17	# TCMalloc hacks
		18	IF(MALLOC_LIB)
		19	@@ -140,6 +142,7 @@
		20	SET(HOSTNAME "hostname")
		21	SET(MYSQLD_USER "mysql")
		22
		23	+IF(FALSE)
		24	# Required for mysqlbug until autotools are deprecated, once done remove these
		25	# and expand default cmake variables
		26	SET(CC ${CMAKE_C_COMPILER})
		27	@@ -180,6 +183,7 @@
		28	DESTINATION ${INSTALL_BINDIR}
		29	COMPONENT Server
		30	)
		31	+ENDIF()
		32
		33	ENDIF(UNIX)
		34
		35	@@ -204,6 +208,7 @@
		36	SET(localstatedir ${MYSQL_DATADIR})
		37	ENDIF()
		38
		39	+IF()
16	IF(UNIX)	40	IF(UNIX)
17	SET(prefix ${CMAKE_INSTALL_PREFIX})	41	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
18	+ IF(FALSE)	42	${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)	43	@@ -219,6 +224,7 @@
20	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	44	COMPONENT Server
21	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )	45	)
22	@@ -67,8 +70,10 @@	46	ENDIF()
23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	47	+ENDIF()
24	INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
25	ENDIF()
26	+ ENDIF()
27		48
28	INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)	49	SET(prefix "${CMAKE_INSTALL_PREFIX}")
29	+ IF(FALSE)	50	SET(sysconfdir ${prefix})
30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)	51	@@ -335,18 +341,8 @@
31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)	52	SET(BIN_SCRIPTS
32		53	msql2mysql
33	@@ -92,6 +97,7 @@	54	mysql_config
34	DESTINATION ${inst_location} COMPONENT SupportFiles	55	- mysql_fix_extensions
35	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	56	- mysql_setpermission
36	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	57	- mysql_secure_installation
37	+	58	- mysql_zap
38		59	mysqlaccess
39	IF (INSTALL_SYSCONFDIR)	60	- mysql_convert_table_format
40	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d	61	mysql_find_rows
41	@@ -101,6 +107,7 @@	62	- mytop
42	RENAME mysql COMPONENT SupportFiles	63	- mysqlhotcopy
43	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	64	- mysqldumpslow
44	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	65	- mysqld_multi
45	+ ENDIF()	66	- mysqld_safe
46		67	)
47	INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}	68	FOREACH(file ${BIN_SCRIPTS})
48	COMPONENT Common)	69	IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
49		70	@@ -386,4 +382,3 @@
		71	COMPONENT Development)
		72	ENDIF()
		73	ENDIF()
		74	-

Lines 1-5 Link Here

(-)mariadb55-client/files/patch-support-files_CMakeLists.txt (-13 / +5 lines)
1	--- support-files/CMakeLists.txt.orig 2014-06-13 13:36:52.080474738 +0300	1	--- support-files/CMakeLists.txt.orig 2014-10-08 15:19:53.000000000 +0200
2	+++ support-files/CMakeLists.txt 2014-06-13 13:50:59.537282325 +0300	2	+++ support-files/CMakeLists.txt 2014-10-17 22:34:28.000000000 +0200
3	@@ -41,15 +41,18 @@	3	@@ -41,15 +41,18 @@
4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})	4	SET(inst_location ${INSTALL_SUPPORTFILESDIR})
5	ENDIF()	5	ENDIF()
Lines 19-25 Link Here
19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)	19	FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure)
20	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh	20	CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh
21	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )	21	${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
22	@@ -67,8 +70,10 @@	22	@@ -69,8 +72,10 @@
23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)	23	INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
24	INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)	24	INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
25	ENDIF()	25	ENDIF()
Lines 30-48 Link Here
30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)	30	CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)	31	CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
32		32
33	@@ -92,6 +97,7 @@	33	@@ -94,6 +99,7 @@
34	DESTINATION ${inst_location} COMPONENT SupportFiles	34	DESTINATION ${inst_location} COMPONENT SupportFiles
35	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ	35	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
36	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)	36	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
37	+	37	+ ENDIF()
38		38
39	IF (INSTALL_SYSCONFDIR)	39	IF (INSTALL_SYSCONFDIR)
40	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d	40	INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
41	@@ -101,6 +107,7 @@
42	RENAME mysql COMPONENT SupportFiles
43	PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
44	GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
45	+ ENDIF()
46
47	INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
48	COMPONENT Common)

Line 0 Link Here

(-)mariadb55-client/patch-cmake__jemalloc.cmake (+14 lines)
	1	--- cmake/jemalloc.cmake.orig 2013-09-20 00:34:22.000000000 +0200
	2	+++ cmake/jemalloc.cmake 2013-09-27 22:46:05.791110010 +0200
	3	@@ -37,9 +37,9 @@
	4	SET(WITH_JEMALLOC "no")
	5	ENDIF()
	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)
	9	IF (HAVE_JEMALLOC)
	10	- SET(LIBJEMALLOC jemalloc)
	11	+ SET(LIBJEMALLOC c)
	12	ELSEIF (WITH_JEMALLOC STREQUAL "system")
	13	MESSAGE(FATAL_ERROR "system jemalloc is not found")
	14	ELSEIF (WITH_JEMALLOC STREQUAL "yes")