diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2011-10-07 09:46:50 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2011-10-07 09:46:50 +0000 |
| commit | 7c285d805015ed2e7414087dd934ed23e1f91fca (patch) | |
| tree | 5038b29085e597a91bb79c72f51bcc0994a07b61 /databases/percona55-server/files | |
| parent | c6097e522e6aab9bd7b106c6d799e56c8dbe3c32 (diff) | |
| download | ports-7c285d805015ed2e7414087dd934ed23e1f91fca.tar.gz ports-7c285d805015ed2e7414087dd934ed23e1f91fca.zip | |
Update to 5.5.16 release.
Notes
Notes:
svn path=/head/; revision=283107
Diffstat (limited to 'databases/percona55-server/files')
| -rw-r--r-- | databases/percona55-server/files/patch-client_CMakeLists.txt | 20 | ||||
| -rw-r--r-- | databases/percona55-server/files/patch-cmake_plugin.cmake | 12 |
2 files changed, 20 insertions, 12 deletions
diff --git a/databases/percona55-server/files/patch-client_CMakeLists.txt b/databases/percona55-server/files/patch-client_CMakeLists.txt index b36a0f4c1791..2c5864188b98 100644 --- a/databases/percona55-server/files/patch-client_CMakeLists.txt +++ b/databases/percona55-server/files/patch-client_CMakeLists.txt @@ -1,5 +1,5 @@ ---- client/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ client/CMakeLists.txt 2010-12-23 18:01:04.000000000 +0100 +--- client/CMakeLists.txt.orig 2011-09-09 17:56:40.000000000 +0200 ++++ client/CMakeLists.txt 2011-10-07 11:06:21.000000000 +0200 @@ -27,17 +27,20 @@ ADD_DEFINITIONS(${READLINE_DEFINES}) @@ -21,7 +21,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) -@@ -46,11 +49,13 @@ +@@ -46,17 +49,21 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) @@ -34,8 +34,16 @@ +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) -@@ -63,13 +68,14 @@ +@@ -66,13 +73,14 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) @@ -46,8 +54,8 @@ MYSQL_ADD_EXECUTABLE(echo echo.c) ENDIF(WIN32) --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap -+SET_TARGET_PROPERTIES (mysql_upgrade +-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin ++SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE) ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/percona55-server/files/patch-cmake_plugin.cmake b/databases/percona55-server/files/patch-cmake_plugin.cmake index e5c97d0bdcdf..c151ea35f4ee 100644 --- a/databases/percona55-server/files/patch-cmake_plugin.cmake +++ b/databases/percona55-server/files/patch-cmake_plugin.cmake @@ -1,10 +1,10 @@ ---- cmake/plugin.cmake.orig 2011-06-21 18:42:39.000000000 +0200 -+++ cmake/plugin.cmake 2011-07-12 09:24:41.000000000 +0200 -@@ -196,7 +196,6 @@ +--- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200 ++++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200 +@@ -195,7 +195,6 @@ OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") # Install dynamic library MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) - INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) - # For internal testing in PB2, append collections files - IF(DEFINED ENV{PB2WORKDIR}) - PLUGIN_APPEND_COLLECTIONS(${plugin}) + # Add installed files to list for RPMs + FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files + "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" |