mirror of
https://git.freebsd.org/ports.git
synced 2025-05-30 09:56:43 -04:00
6cead7efb7
- Update to 10.0.29 - Update mariadb100-client - Update patches - Regen patches with makepatch - Pet portlint - Add MROONGA liblz4 dependency - Fix MROONGA liblz4 linking - rm erroneously installed files PR: 197232, 204014, 215901 MFH: 2017Q1 Security: 22373c43-d728-11e6-a9a5-b499baebfeaf
78 lines
1.9 KiB
Text
78 lines
1.9 KiB
Text
--- scripts/CMakeLists.txt.orig 2017-01-12 01:45:19 UTC
|
|
+++ scripts/CMakeLists.txt
|
|
@@ -73,6 +73,7 @@ IF(UNIX)
|
|
)
|
|
ENDIF()
|
|
|
|
+IF(FALSE)
|
|
INSTALL(FILES
|
|
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
|
|
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
|
|
@@ -82,6 +83,7 @@ INSTALL(FILES
|
|
${FIX_PRIVILEGES_SQL}
|
|
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
|
|
)
|
|
+ENDIF()
|
|
|
|
# TCMalloc hacks
|
|
IF(MALLOC_LIB)
|
|
@@ -134,6 +136,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})
|
|
@@ -168,6 +171,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
|
|
DESTINATION ${INSTALL_BINDIR}
|
|
COMPONENT Server
|
|
)
|
|
+ENDIF()
|
|
|
|
ENDIF(UNIX)
|
|
|
|
@@ -192,6 +196,7 @@ ELSE()
|
|
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)
|
|
@@ -207,6 +212,7 @@ INSTALL_SCRIPT(
|
|
COMPONENT Server
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
SET(prefix "${CMAKE_INSTALL_PREFIX}")
|
|
IF(INSTALL_SYSCONFDIR)
|
|
@@ -269,6 +275,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
|
|
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()
|
|
@@ -327,18 +335,8 @@ ELSE()
|
|
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)
|