4858c5d946
databases/mysql80-client: Unbreak patching Broken after patch(1) changes in r326084 PR: 228788 Submitted by: curtis@ipv6.occnc.com Approved by: tcberner (mentor) mmokhi (maintainer) Differential Revision: https://reviews.freebsd.org/D16532 databases/mysql80-{client, server}: Update ports to 8.0.12 This update includes Oracle Critical Patch Advisory published on July 2018 More info: http://www.oracle.com/technetwork/security-advisory/cpujul2018-4258247.html#AppendixMSQL Also: Delete upstreamed hunks of patches. Change local patches regarding upstream changes. PR: 229861 Reported by: Markus Kohlmeyer <rootservice@gmail.com> Sponsored by: The FreeBSD Foundation databases/mysql80-server: Fix build on default Clang of 10.4-base Add sse4.2 flag to CXXFLAGS on 10.4 case. The build-script needs it when using intrin lib on crc32 Sponsored by: The FreeBSD Foundation databases/mysql80-server: Use c++14-lang instead of `msse-4.2 in CXXFLAG` As suggested via replies to r477036 using `-msse-4.2` may break build on other platforms. Reported by: linimon danfe jbeich Sponsored by: The FreeBSD Foundation databases/mysql80-server: Delete no-longer-needed patch for sse4.2 Reported by: jbeich Sponsored by: The FreeBSD Foundation Approved by: ports-secteam (feld)
65 lines
1.9 KiB
Plaintext
65 lines
1.9 KiB
Plaintext
--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
+++ scripts/CMakeLists.txt
|
|
@@ -43,6 +43,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
|
|
@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs
|
|
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,
|
|
@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER)
|
|
)
|
|
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" )
|
|
@@ -150,6 +153,7 @@ IF(UNIX)
|
|
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
INSTALL(FILES
|
|
@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
|
|
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()
|
|
@@ -430,19 +436,7 @@ ELSE()
|
|
# 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}")
|