mirror of
https://git.freebsd.org/ports.git
synced 2025-06-13 00:30:33 -04:00
74aca3ab1f
Release notes: https://www.percona.com/doc/percona-server/5.7/release-notes/Percona-Server-5.7.20-18.html MFH: 2017Q4
72 lines
2.1 KiB
Text
72 lines
2.1 KiB
Text
--- scripts/CMakeLists.txt.orig 2017-12-11 07:56:49.000000000 +0000
|
|
+++ scripts/CMakeLists.txt 2017-12-31 14:31:35.649012000 +0000
|
|
@@ -23,6 +23,7 @@
|
|
SET(COMPILER_ID_AND_VERSION
|
|
"${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}")
|
|
|
|
+IF(FALSE)
|
|
# Build mysql_fix_privilege_tables.sql (concatenate 2 sql scripts)
|
|
IF(NOT WIN32 OR CMAKE_CROSSCOMPILING)
|
|
FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable")
|
|
@@ -65,7 +66,9 @@
|
|
ALL
|
|
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
|
|
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
|
|
+ENDIF()
|
|
)
|
|
+ENDIF()
|
|
|
|
# If we do not have performance schema compiled in then sys will not work,
|
|
# so only create an empty sys database with an auto-generated file,
|
|
@@ -146,6 +149,7 @@
|
|
)
|
|
ENDIF()
|
|
|
|
+IF(FALSE)
|
|
IF(UNIX)
|
|
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
|
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" )
|
|
@@ -153,6 +157,7 @@
|
|
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
INSTALL(FILES
|
|
@@ -332,6 +337,8 @@
|
|
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
|
|
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
+ ELSEIF(lib STREQUAL "-pthread")
|
|
+ SET(${var} "${${var}}-pthread " )
|
|
ELSE()
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
ENDIF()
|
|
@@ -417,25 +424,7 @@
|
|
# On Unix, most of the files end up in the bin directory
|
|
SET(mysql_config_COMPONENT COMPONENT Development)
|
|
|
|
- IF(WITH_SYSTEMD)
|
|
- SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
- mysqldumpslow
|
|
- ps_tokudb_admin
|
|
- ps_mysqld_helper
|
|
- ps-admin
|
|
- )
|
|
- ELSE()
|
|
- SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
- mysqldumpslow
|
|
- mysqld_multi
|
|
- mysqld_safe
|
|
- ps_tokudb_admin
|
|
- ps_mysqld_helper
|
|
- ps-admin
|
|
- )
|
|
- ENDIF()
|
|
+ SET(BIN_SCRIPTS mysql_config)
|
|
|
|
SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
|
|
STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
|