diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2014-06-02 12:28:58 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2014-06-02 12:28:58 +0000 |
| commit | afcacdf12259102da69f3c0dffa9d526609a53c1 (patch) | |
| tree | 5770047c4e8a21073c881a6c8d12354e30c682ed /databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt | |
| parent | net-mgmt/cflowd: Deprecate and expire on 15 August 2014 (diff) | |
- Update to 5.5.37
PR: 189887
Submitted by: maintainer
Diffstat (limited to 'databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt index f4d2544deeb5..18be6bfa471a 100644 --- a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2014-02-11 20:20:18.571491184 -0600 -+++ libmysql/CMakeLists.txt 2014-02-11 20:23:27.474449535 -0600 -@@ -329,7 +329,7 @@ +--- libmysql/CMakeLists.txt.orig 2014-04-15 14:02:39.000000000 +0300 ++++ libmysql/CMakeLists.txt 2014-05-16 19:33:07.000000000 +0300 +@@ -377,7 +377,7 @@ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -9,7 +9,7 @@ # Visual Studio users need debug static library for debug projects INSTALL_DEBUG_SYMBOLS(clientlib) -@@ -338,6 +338,7 @@ +@@ -386,6 +386,7 @@ INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() @@ -17,20 +17,22 @@ IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -352,9 +353,11 @@ +@@ -400,11 +401,13 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() +ENDIF() IF(NOT DISABLE_SHARED) -- MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries) -+ MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_EXTRA} COMPONENT SharedLibraries NOINSTALL) + MERGE_LIBRARIES(libmysql SHARED ${LIBS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_5_1_EXTRA} ${CLIENT_API_5_5_EXTRA} +- COMPONENT SharedLibraries) ++ COMPONENT SharedLibraries NOINSTALL) +IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -401,3 +404,4 @@ +@@ -448,3 +451,4 @@ ENDFOREACH() ENDIF() ENDIF() |