diff options
author | Alex Dupre <ale@FreeBSD.org> | 2011-01-11 20:33:38 +0000 |
---|---|---|
committer | Alex Dupre <ale@FreeBSD.org> | 2011-01-11 20:33:38 +0000 |
commit | 784b9604427bf4679398e1a310b7ff288ded587b (patch) | |
tree | cf0a3df529e268b1237b572ee2275b9f5d1ae5b7 /databases/percona55-server/files/patch-scripts_CMakeLists.txt | |
parent | Add patch that handles app being run with stdout disconnected (diff) |
Remove any attempts to create a libmysqlclient not linked to a threading library.
Restore previous libraries location.
These two changes should fix most of the reported errors.
Feature safe: yes
Diffstat (limited to 'databases/percona55-server/files/patch-scripts_CMakeLists.txt')
-rw-r--r-- | databases/percona55-server/files/patch-scripts_CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/databases/percona55-server/files/patch-scripts_CMakeLists.txt b/databases/percona55-server/files/patch-scripts_CMakeLists.txt index 9c9ce95a8209..c3d2d764e640 100644 --- a/databases/percona55-server/files/patch-scripts_CMakeLists.txt +++ b/databases/percona55-server/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,15 @@ ---- scripts/CMakeLists.txt.orig 2010-12-23 17:38:12.000000000 +0100 -+++ scripts/CMakeLists.txt 2010-12-23 17:40:29.000000000 +0100 -@@ -316,16 +316,11 @@ +--- scripts/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 ++++ scripts/CMakeLists.txt 2011-01-11 20:20:02.000000000 +0100 +@@ -266,6 +266,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() +@@ -316,16 +318,11 @@ # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) SET(BIN_SCRIPTS |