summaryrefslogtreecommitdiff
path: root/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
diff options
context:
space:
mode:
authorMark Felder <feld@FreeBSD.org>2014-03-03 16:23:58 +0000
committerMark Felder <feld@FreeBSD.org>2014-03-03 16:23:58 +0000
commit6a73fedbcf32ee639c547fcc3e1651ee660d460e (patch)
tree99cc963f2874bf4e9207e251bc83590087039f3b /databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
parent- Update to version 5.21.0 [1] (diff)
Update to 5.5.35
Maintainer is not available for further feedback (Ukraine) Stay safe, Alexandr PR: ports/185012 Sponsored by: SupraNet Communications, Inc
Diffstat (limited to 'databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt')
-rw-r--r--databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt15
1 files changed, 8 insertions, 7 deletions
diff --git a/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb55-server/files/patch-libmysql_CMakeLists.txt
index 18eef8acc03d..f4d2544deeb5 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 2013-03-15 22:24:20.000000000 +0200
-+++ libmysql/CMakeLists.txt 2013-03-15 22:24:34.000000000 +0200
-@@ -329,13 +329,14 @@
+--- 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 @@
# 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)
+@@ -338,6 +338,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}")
-@@ -350,9 +351,11 @@
+@@ -352,9 +353,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)
-@@ -399,3 +402,4 @@
+@@ -401,3 +404,4 @@
ENDFOREACH()
ENDIF()
ENDIF()