mirror of
https://git.freebsd.org/ports.git
synced 2025-06-09 23:00:30 -04:00
4af533cdd3
- Update to 10.0.21 - Updates mariadb100-client as well (slave-port) - Silence portlint - Re-roll patches with makepatch [1] https://mariadb.atlassian.net/browse/MDEV-7398 [2] https://mariadb.atlassian.net/browse/MDEV-8128 Changes: https://mariadb.com/kb/en/mariadb/mariadb-10021-changelog/ Differential revision: https://reviews.freebsd.org/D2771 Reviewed by: koobs (mentor), vsevolod (mentor) Approved by: vsevolod (mentor) PR: 200097 Security: 36bd352d-299b-11e5-86ff-14dae9d210b8 MFH: 2015Q3
39 lines
1.3 KiB
Text
39 lines
1.3 KiB
Text
--- 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.
|
|
-MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
|
|
+MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL)
|
|
|
|
# Visual Studio users need debug static library for debug projects
|
|
IF(MSVC)
|
|
@@ -418,6 +418,7 @@ IF(MSVC)
|
|
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}")
|
|
@@ -432,11 +433,13 @@ IF(UNIX)
|
|
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_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)
|
|
@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
|
|
ENDFOREACH()
|
|
ENDIF()
|
|
ENDIF()
|
|
+ENDIF()
|