mirror of
https://git.freebsd.org/ports.git
synced 2025-05-15 08:41:51 -04:00
4b382c759b
This update includes security fixes on issues that are mentioned on upstream critical patch report. Further info: https://www.oracle.com/technetwork/security-advisory/cpujul2019-5072835.html#AppendixMSQL PR: 239271 Submitted by: Greg Veldman <freebsd@gregv.net> Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: Platform.sh
64 lines
1.8 KiB
Text
64 lines
1.8 KiB
Text
--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400
|
|
+++ scripts/CMakeLists.txt 2019-08-01 10:59:24.177559000 -0400
|
|
@@ -46,6 +46,7 @@
|
|
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
|
|
@@ -66,6 +67,7 @@
|
|
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c
|
|
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h
|
|
)
|
|
+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 +148,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 +156,7 @@
|
|
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
INSTALL(FILES
|
|
@@ -326,6 +330,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()
|
|
@@ -411,19 +417,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
|
|
- )
|
|
- ELSE()
|
|
- SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
- mysqldumpslow
|
|
- mysqld_multi
|
|
- mysqld_safe
|
|
- )
|
|
- ENDIF()
|
|
+ SET(BIN_SCRIPTS mysql_config)
|
|
|
|
SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
|
|
STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
|