aboutsummaryrefslogtreecommitdiff
path: root/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt')
-rw-r--r--databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
index 00813cb9fa00..a692fdfec2f0 100644
--- a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig 2014-08-09 00:13:37.000000000 +0200
-+++ libmysql/CMakeLists.txt 2014-09-05 18:46:34.420323119 +0200
-@@ -403,7 +403,7 @@
+--- libmysql/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC
++++ libmysql/CMakeLists.txt
+@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
# 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
IF(MSVC)
-@@ -411,6 +411,7 @@
+@@ -418,6 +418,7 @@ IF(MSVC)
INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
ENDIF()
@@ -17,7 +17,7 @@
IF(UNIX)
MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
SET(DOT_VERSION ".${VERSION}")
-@@ -425,11 +426,13 @@
+@@ -432,11 +433,13 @@ IF(UNIX)
ENDMACRO()
INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
ENDIF()
@@ -32,7 +32,7 @@
IF(UNIX)
# libtool compatability
IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -477,3 +480,4 @@
+@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
ENDFOREACH()
ENDIF()
ENDIF()