summaryrefslogtreecommitdiff
path: root/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
diff options
context:
space:
mode:
authorJochen Neumeister <joneum@FreeBSD.org>2020-01-08 16:47:12 +0000
committerJochen Neumeister <joneum@FreeBSD.org>2020-01-08 16:47:12 +0000
commit342c784ae3cb74eeb87d281182060a1a31a1481c (patch)
tree507562d12bec10bc99bb7bd7de1c273e3934a2da /databases/mysql80-server/files/patch-scripts_CMakeLists.txt
parent- update from 1.1.7 to 1.1.8 (diff)
databases/mysql80-{client, server}: Update to latest release 8.0.18
switch patch-files to mysql80-server to make it easy for maintain. Bugfix: - CMake now enables use of fastcov if it is available. fastcov is faster than lcov or gcov. This requires GCC and gcov versions of 9 or higher. - The DISABLE_SHARED CMake option was unused and has been removed. - The CMake code to find Protobuf executables now works on platforms that split these into multiple packages. - The new ADD_GDB_INDEX CMake option determines whether to enable generation of a .gdb_index section in binaries, which makes loading them in a debugger faster. The option is disabled by default. It has no effect if a linker other than lld or GNU gold is used. - For the INSTALL_LAYOUT CMake option, the SLES and WIN option values were not used and have been removed. - The max_prepared_stmt_count system variable maximum value has been increased from 1 million (1,048,576) to 4 million (4,194,304). The default value remains unchanged at 16,382. - MySQL 8.0 no longer supports building using wolfSSL. All MySQL builds now use OpenSSL. - The RE2 library is no longer used by MySQL. The library is no longer bundled with source distributions and the WITH_RE2 CMake option is obsolete. More Infos: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-18.html A big thanks to @fluffy for his help with this update MFH: 2020Q1 Security: fc91f2ef-fd7b-11e9-a1c7-b499baebfeaf Sponsored by: Netzkommune GmbH
Diffstat (limited to 'databases/mysql80-server/files/patch-scripts_CMakeLists.txt')
-rw-r--r--databases/mysql80-server/files/patch-scripts_CMakeLists.txt37
1 files changed, 28 insertions, 9 deletions
diff --git a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
index 9334ba74754b..1faa52395d26 100644
--- a/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql80-server/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,15 @@
---- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
+--- scripts/CMakeLists.txt.orig 2019-09-20 08:30:51 UTC
+++ scripts/CMakeLists.txt
-@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+@@ -327,7 +327,7 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
+ LIST(REMOVE_DUPLICATES ${target}_LIB_DEPENDS)
+ FOREACH(lib ${${target}_LIB_DEPENDS})
+ # Filter out "general", it is not a library, just CMake hint
+- IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} ")
++ IF(NOT lib STREQUAL "general" AND NOT ${var} MATCHES "-l${lib} " AND NOT lib STREQUAL "imported_openssl" AND NOT lib STREQUAL "imported_crypto")
+ IF (lib MATCHES "^\\-l")
+ SET(${var} "${${var}} ${lib} ")
+ ELSEIF (lib MATCHES "^\\-L")
+@@ -337,6 +337,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} " )
@@ -9,11 +18,8 @@
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
-@@ -430,14 +432,13 @@ ELSE()
- # On Unix, most of the files end up in the bin directory
- SET(mysql_config_COMPONENT COMPONENT Development)
+@@ -423,18 +425,23 @@ ELSE()
-+
IF(WITH_SYSTEMD)
SET(BIN_SCRIPTS
- mysql_config
@@ -25,16 +31,29 @@
mysqldumpslow
mysqld_multi
mysqld_safe
-@@ -485,7 +486,7 @@
+ )
+ ENDIF()
+
++ IF(NOT WITHOUT_CLIENTLIBS)
++ SET(BIN_SCRIPTS
++ ${BIN_SCRIPTS}
++ mysql_config
++ )
++ ENDIF(NOT WITHOUT_CLIENTLIBS)
++
+ SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc)
+ STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}")
+ SET(PKGCONFIG_DIR "${PKGCONFIG_DIR}/pkgconfig")
+@@ -449,7 +456,7 @@ ELSE()
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
ESCAPE_QUOTES @ONLY)
- IF(INSTALL_PKGCONFIGDIR)
-+ IF(FALSE)
++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS)
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
INSTALL(FILES
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
-@@ -498,7 +499,7 @@
+@@ -462,7 +469,7 @@ ELSE()
FOREACH(file ${BIN_SCRIPTS})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh