mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 22:30:38 -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
70 lines
2.3 KiB
Text
70 lines
2.3 KiB
Text
--- client/CMakeLists.txt.orig 2015-06-17 14:54:11 UTC
|
|
+++ client/CMakeLists.txt
|
|
@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
|
|
COPY_OPENSSL_DLLS(copy_openssl_client)
|
|
|
|
ADD_DEFINITIONS(${SSL_DEFINES})
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
|
|
${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
|
|
TARGET_LINK_LIBRARIES(mysql mysqlclient)
|
|
@@ -37,6 +38,7 @@ IF(UNIX)
|
|
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
|
|
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
|
|
ENDIF(UNIX)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
|
|
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
|
|
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
|
|
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
|
|
|
|
@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
|
|
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
|
|
TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
|
|
ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
|
|
TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
|
|
+ENDIF()
|
|
|
|
MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
|
|
TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
|
|
|
|
+IF(FALSE)
|
|
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
|
|
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
|
|
|
|
@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
|
|
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
|
|
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
|
|
TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
|
|
+ENDIF()
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|
|
MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk)
|
|
ENDIF(WIN32)
|
|
|
|
+IF(FALSE)
|
|
# async_example is just a code example, do not install it.
|
|
ADD_EXECUTABLE(async_example async_example.c)
|
|
TARGET_LINK_LIBRARIES(async_example mysqlclient)
|
|
+ENDIF()
|
|
|
|
-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example
|
|
+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin
|
|
PROPERTIES HAS_CXX TRUE)
|
|
|
|
ADD_DEFINITIONS(-DHAVE_DLOPEN)
|