ports/databases/mariadb101-client/files/patch-scripts_CMakeLists.txt
Bernard Spil ff0e021d48 databases/mariadb101-server: Security update to 10.1.35
Security:	909be51b-9b3b-11e8-add2-b499baebfeaf
2018-08-08 19:09:45 +00:00

64 lines
1.7 KiB
Text

--- scripts/CMakeLists.txt.orig 2016-07-14 01:10:23 UTC
+++ scripts/CMakeLists.txt
@@ -45,6 +45,7 @@ ELSE()
MESSAGE(FATAL_ERROR "Cannot concatenate files")
ENDIF()
+IF(FALSE)
# Build mysql_fix_privilege_tables.c
ADD_CUSTOM_COMMAND(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
@@ -65,6 +66,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
ALL
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
)
+ENDIF()
IF(UNIX)
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
@@ -164,6 +166,7 @@ ENDIF()
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})
@@ -198,6 +201,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
DESTINATION ${INSTALL_BINDIR}
COMPONENT Server
)
+ENDIF()
ENDIF(UNIX)
@@ -228,6 +232,7 @@ SET(mysqld_locations "$basedir/${INSTALL
SET(errmsg_locations "$basedir/${INSTALL_MYSQLSHAREDIR}/english $basedir/share/english $basedir/share/mysql/english")
SET(pkgdata_locations "$basedir/${INSTALL_MYSQLSHAREDIR} $basedir/share $basedir/share/mysql")
+IF()
IF(UNIX)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
@@ -241,6 +246,7 @@ INSTALL_SCRIPT(
COMPONENT Server
)
ENDIF()
+ENDIF()
SET(prefix "${CMAKE_INSTALL_PREFIX}")
IF(INSTALL_SYSCONFDIR)
@@ -333,13 +339,8 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config
- mysql_setpermission
- mysql_secure_installation
mysqlaccess
- mysql_convert_table_format
mysql_find_rows
- mytop
- mysqlhotcopy
${SERVER_SCRIPTS}
${WSREP_SCRIPTS}
${SYSTEMD_SCRIPTS}