diff options
Diffstat (limited to 'databases/mysql57-server/files/patch-libmysql_CMakeLists.txt')
| -rw-r--r-- | databases/mysql57-server/files/patch-libmysql_CMakeLists.txt | 38 |
1 files changed, 13 insertions, 25 deletions
diff --git a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt index 1f9b8282e5d3..9a503132172a 100644 --- a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 -+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 -@@ -173,7 +173,7 @@ +--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ libmysql/CMakeLists.txt +@@ -215,7 +215,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient @@ -9,33 +9,21 @@ # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -200,19 +200,22 @@ - ENDMACRO() - ENDIF() - -+IF(FALSE) - IF(UNIX) - GET_TARGET_NAME(mysqlclient lib_name) - INSTALL_SYMLINK(mysqlclient - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a - ${INSTALL_LIBDIR} Development) - ENDIF() -+ENDIF() - - IF(NOT DISABLE_SHARED) - # Merge several convenience libraries into one big mysqlclient +@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. MERGE_LIBRARIES(libmysql SHARED ${LIBS} - EXPORTS ${CLIENT_API_FUNCTIONS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries NOINSTALL) -+ IF(FALSE) ++IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -271,4 +274,5 @@ - ${INSTALL_LIBDIR} SharedLibraries) - ENDFOREACH() - ENDIF() +@@ -313,6 +314,7 @@ ENDIF() + # to initialize api_calls[] array in api_test.c + # + SET(CLIENT_API_FUNCTION_LIST "") + ENDIF() - ENDIF() + FOREACH(api ${CLIENT_API_FUNCTIONS}) + SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") + ENDFOREACH() |