Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
--- scripts/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200 | --- scripts/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC | ||||
+++ scripts/CMakeLists.txt 2014-09-05 22:33:01.060378167 +0200 | +++ scripts/CMakeLists.txt | ||||
@@ -72,6 +72,7 @@ | @@ -73,6 +73,7 @@ IF(UNIX) | ||||
) | ) | ||||
ENDIF() | ENDIF() | ||||
+IF(FALSE) | +IF(FALSE) | ||||
INSTALL(FILES | INSTALL(FILES | ||||
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql | ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql | ||||
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql | ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql | ||||
@@ -81,6 +82,7 @@ | @@ -84,6 +85,7 @@ INSTALL(FILES | ||||
${FIX_PRIVILEGES_SQL} | ${FIX_PRIVILEGES_SQL} | ||||
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server | DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server | ||||
) | ) | ||||
+ENDIF() | +ENDIF() | ||||
# TCMalloc hacks | # TCMalloc hacks | ||||
IF(MALLOC_LIB) | IF(MALLOC_LIB) | ||||
@@ -140,6 +142,7 @@ | @@ -136,6 +138,7 @@ ENDIF() | ||||
SET(HOSTNAME "hostname") | SET(HOSTNAME "hostname") | ||||
SET(MYSQLD_USER "mysql") | SET(MYSQLD_USER "mysql") | ||||
+IF(FALSE) | +IF(FALSE) | ||||
# Required for mysqlbug until autotools are deprecated, once done remove these | # Required for mysqlbug until autotools are deprecated, once done remove these | ||||
# and expand default cmake variables | # and expand default cmake variables | ||||
SET(CC ${CMAKE_C_COMPILER}) | SET(CC ${CMAKE_C_COMPILER}) | ||||
@@ -180,6 +183,7 @@ | @@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI | ||||
DESTINATION ${INSTALL_BINDIR} | DESTINATION ${INSTALL_BINDIR} | ||||
COMPONENT Server | COMPONENT Server | ||||
) | ) | ||||
+ENDIF() | +ENDIF() | ||||
ENDIF(UNIX) | ENDIF(UNIX) | ||||
@@ -204,6 +208,7 @@ | @@ -195,6 +199,7 @@ ELSE() | ||||
SET(localstatedir ${MYSQL_DATADIR}) | SET(localstatedir ${MYSQL_DATADIR}) | ||||
ENDIF() | ENDIF() | ||||
+IF() | +IF() | ||||
IF(UNIX) | IF(UNIX) | ||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh | ||||
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) | ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) | ||||
@@ -219,6 +224,7 @@ | @@ -208,6 +213,7 @@ INSTALL_SCRIPT( | ||||
COMPONENT Server | COMPONENT Server | ||||
) | ) | ||||
ENDIF() | ENDIF() | ||||
+ENDIF() | +ENDIF() | ||||
SET(prefix "${CMAKE_INSTALL_PREFIX}") | SET(prefix "${CMAKE_INSTALL_PREFIX}") | ||||
IF(INSTALL_SYSCONFDIR) | IF(INSTALL_SYSCONFDIR) | ||||
@@ -281,6 +287,8 @@ | @@ -286,18 +292,8 @@ ELSE() | ||||
STRING(REGEX REPLACE "^lib" "" lib "${lib}") | |||||
SET(${var} "${${var}}-l${lib} " ) | |||||
ENDIF() | |||||
+ ELSEIF(lib STREQUAL "-pthread") | |||||
+ SET(${var} "${${var}}-pthread " ) | |||||
ELSE() | |||||
SET(${var} "${${var}}-l${lib} " ) | |||||
ENDIF() | |||||
@@ -339,18 +347,8 @@ | |||||
SET(BIN_SCRIPTS | SET(BIN_SCRIPTS | ||||
msql2mysql | msql2mysql | ||||
mysql_config | mysql_config | ||||
- mysql_fix_extensions | - mysql_fix_extensions | ||||
- mysql_setpermission | - mysql_setpermission | ||||
- mysql_secure_installation | - mysql_secure_installation | ||||
- mysql_zap | - mysql_zap | ||||
mysqlaccess | mysqlaccess | ||||
- mysql_convert_table_format | - mysql_convert_table_format | ||||
mysql_find_rows | mysql_find_rows | ||||
- mytop | - mytop | ||||
- mysqlhotcopy | - mysqlhotcopy | ||||
- mysqldumpslow | - mysqldumpslow | ||||
- mysqld_multi | - mysqld_multi | ||||
- mysqld_safe | - mysqld_safe | ||||
${WSREP_BINARIES} | |||||
${SYSTEMD_SCRIPTS} | |||||
) | ) | ||||
FOREACH(file ${BIN_SCRIPTS}) | |||||
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) |