diff options
| author | Bernard Spil <brnrd@FreeBSD.org> | 2019-05-11 12:32:23 +0000 |
|---|---|---|
| committer | Bernard Spil <brnrd@FreeBSD.org> | 2019-05-11 12:32:23 +0000 |
| commit | 21b34c7552c4d2767daa2e7913f9f1ca43d902b8 (patch) | |
| tree | e2881e0fbc9ff32e8f7f3e2245b5fb994d51be9f /databases/mariadb102-server/files | |
| parent | Update to 1.4.1 (diff) | |
databases/mariadb102-server: Security update to 10.2.24
- CMake OPTIONS refactoring
- Move everything to master port
MFH: 2019Q2
Security: 4e1997e8-5de0-11e9-b95c-b499baebfeaf
Diffstat (limited to 'databases/mariadb102-server/files')
| -rw-r--r-- | databases/mariadb102-server/files/patch-client_CMakeLists.txt | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/databases/mariadb102-server/files/patch-client_CMakeLists.txt b/databases/mariadb102-server/files/patch-client_CMakeLists.txt deleted file mode 100644 index 62278ea6f555..000000000000 --- a/databases/mariadb102-server/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,77 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-02-09 23:24:08 UTC -+++ client/CMakeLists.txt -@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) - SET(CLIENT_LIB mariadbclient mysys) - - ADD_DEFINITIONS(${SSL_DEFINES}) -+ -+IF(NOT WITHOUT_CLIENT) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc - ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) - TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) -@@ -44,12 +46,6 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - --MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) --SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") --TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) --SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -- -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) - -@@ -61,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) - --MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) --TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB}) --ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -- --MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) --TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB}) -- --MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) --TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB}) -- - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) - -@@ -90,12 +76,32 @@ ENDIF(WIN32) - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example - PROPERTIES HAS_CXX TRUE) - -- --FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog -+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog - mysqladmin mysqlslap async_example) -+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) -+ENDFOREACH() -+ -+ENDIF() -+ -+MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) -+SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") -+TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) -+SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ -+MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) -+TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB}) -+ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ -+MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) -+TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB}) -+ -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin -+PROPERTIES HAS_CXX TRUE) -+ -+FOREACH(t mysqltest mysql_plugin mysql_upgrade) - ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) - ENDFOREACH() - |