Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
| --- scripts/CMakeLists.txt.orig 2015-12-23 15:33:31 UTC | --- scripts/CMakeLists.txt.orig 2016-03-24 09:12:11 UTC | ||||
| +++ scripts/CMakeLists.txt | +++ scripts/CMakeLists.txt | ||||
| @@ -73,6 +73,7 @@ IF(UNIX) | @@ -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 | ||||
| @@ -84,6 +85,7 @@ INSTALL(FILES | @@ -82,6 +83,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) | ||||
| @@ -136,6 +138,7 @@ ENDIF() | @@ -134,6 +136,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}) | ||||
| @@ -170,6 +173,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI | @@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI | ||||
| DESTINATION ${INSTALL_BINDIR} | DESTINATION ${INSTALL_BINDIR} | ||||
| COMPONENT Server | COMPONENT Server | ||||
| ) | ) | ||||
| +ENDIF() | +ENDIF() | ||||
| ENDIF(UNIX) | ENDIF(UNIX) | ||||
| @@ -195,6 +199,7 @@ ELSE() | @@ -193,6 +197,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) | ||||
| @@ -208,6 +213,7 @@ INSTALL_SCRIPT( | @@ -206,6 +211,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) | ||||
| @@ -286,18 +292,8 @@ ELSE() | @@ -284,18 +290,8 @@ ELSE() | ||||
| 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 | ||||
| Show All 10 Lines | |||||