diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-12-17 10:18:58 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-12-17 10:18:58 +0000 |
| commit | baab9ab9b2de0f9e7c289e431f89e1531bbd12c2 (patch) | |
| tree | 5dda79a745d10bf396b9ed8adaa634ef028f9ed9 /databases/mysql55-server/files | |
| parent | Switch to MASTER_SITES LOCAL/matthew for the 8.x compatible location (diff) | |
Update to 5.5.35 release and stagify.
Notes
Notes:
svn path=/head/; revision=336708
Diffstat (limited to 'databases/mysql55-server/files')
| -rw-r--r-- | databases/mysql55-server/files/patch-libmysql_CMakeLists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt index 7f11bedc9e43..5d364e19ee0e 100644 --- a/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 -@@ -153,13 +153,14 @@ +--- libmysql/CMakeLists.txt.orig 2013-11-05 07:19:26.000000000 +0000 ++++ libmysql/CMakeLists.txt 2013-12-16 14:27:25.505227018 +0000 +@@ -165,7 +165,7 @@ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -8,15 +8,16 @@ +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) # Visual Studio users need debug static library for debug projects - IF(MSVC) - INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) + INSTALL_DEBUG_SYMBOLS(clientlib) +@@ -174,6 +174,7 @@ + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() +IF(FALSE) IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -188,9 +189,11 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() @@ -29,7 +30,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -237,3 +240,4 @@ ENDFOREACH() ENDIF() ENDIF() |