diff options
Diffstat (limited to 'databases/mysql84-server/files/patch-scripts_CMakeLists.txt')
-rw-r--r-- | databases/mysql84-server/files/patch-scripts_CMakeLists.txt | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/databases/mysql84-server/files/patch-scripts_CMakeLists.txt b/databases/mysql84-server/files/patch-scripts_CMakeLists.txt new file mode 100644 index 000000000000..9900330982dc --- /dev/null +++ b/databases/mysql84-server/files/patch-scripts_CMakeLists.txt @@ -0,0 +1,52 @@ +--- scripts/CMakeLists.txt.orig 2024-04-10 06:26:28 UTC ++++ scripts/CMakeLists.txt +@@ -411,6 +411,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) + SET(${var} "${${var}}-L${dir} " ) + ENDIF() + SET(${var} "${${var}}-l${lib} " ) ++ ELSEIF(lib STREQUAL "-pthread") ++ SET(${var} "${${var}}-pthread " ) + ELSE() + SET(${var} "${${var}}-l${lib} " ) + ENDIF() +@@ -484,7 +486,7 @@ ELSE() + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} + ESCAPE_QUOTES @ONLY) + +- IF(INSTALL_PKGCONFIGDIR) ++ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS) + MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}") + INSTALL(FILES + ${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE} +@@ -497,23 +499,28 @@ ELSE() + # mysqld_safe used in mtr even for systemd platforms + IF(WITH_SYSTEMD) + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + mysqld_safe + ) + ELSE() + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + mysqld_multi + mysqld_safe + ) + ENDIF() + ++ IF(NOT WITHOUT_CLIENTLIBS) ++ SET(BIN_SCRIPTS ++ ${BIN_SCRIPTS} ++ mysql_config ++ ) ++ ENDIF(NOT WITHOUT_CLIENTLIBS) ++ + FOREACH(file ${BIN_SCRIPTS}) + IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh +- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY ++ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY + ) + ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in) + CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in |