mirror of
https://git.freebsd.org/ports.git
synced 2025-06-12 00:00:33 -04:00
876164c2f6
for server bundle, right .pc file is already installed by client package PR: 242488 Reported by: fluffy Approved by: mmokhi (maintainer, implicit) Sponsored by: Netzkommune GmbH
45 lines
1.5 KiB
Text
45 lines
1.5 KiB
Text
--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400
|
|
+++ scripts/CMakeLists.txt 2019-08-01 10:10:16.206052000 -0400
|
|
@@ -326,6 +326,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,14 +413,13 @@
|
|
# 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
|
|
@@ -446,7 +447,7 @@
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
ESCAPE_QUOTES @ONLY)
|
|
|
|
- IF(INSTALL_PKGCONFIGDIR)
|
|
+ IF(FALSE)
|
|
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
|
|
INSTALL(FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
@@ -452,7 +453,7 @@
|
|
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})
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
|
|
${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
|