diff options
| author | Mark Felder <feld@FreeBSD.org> | 2018-01-12 17:53:30 +0000 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2018-01-12 17:53:30 +0000 |
| commit | 7adeb35eb84dcfadcdbb191c668d417753131d7f (patch) | |
| tree | 36ae934067e96ddd6a20fd594c230623dd42023f /databases/percona57-server/files/patch-cmake_plugin.cmake | |
| parent | Update to version 1.6.3 (diff) | |
databases/percona57: Fix build with SASL
If SASL is detected at build time it assumes you want SASL and also
errors due to assuming we're Linux. This was already patched in our tree
for MySQL.
Also enable SASL support by default for the databases/percona57-client.
This is expected to be the default by upstream now.
Special thanks to mmokhi for figuring this out for us.
PR: 220865
MFH: 2018Q1
Diffstat (limited to 'databases/percona57-server/files/patch-cmake_plugin.cmake')
| -rw-r--r-- | databases/percona57-server/files/patch-cmake_plugin.cmake | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/databases/percona57-server/files/patch-cmake_plugin.cmake b/databases/percona57-server/files/patch-cmake_plugin.cmake new file mode 100644 index 000000000000..8716c1b962b4 --- /dev/null +++ b/databases/percona57-server/files/patch-cmake_plugin.cmake @@ -0,0 +1,43 @@ +--- cmake/plugin.cmake.orig 2017-06-22 14:13:19 UTC ++++ cmake/plugin.cmake +@@ -219,9 +219,16 @@ MACRO(MYSQL_ADD_PLUGIN) + # Thus we skip TARGET_LINK_LIBRARIES on Linux, as it would only generate + # an additional dependency. + # Use MYSQL_PLUGIN_IMPORT for static data symbols to be exported. +- IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux") ++ # ++ # P.S. "FreeBSD" is obviously not "Linux" but it behaves near similar in this case. ++ IF(NOT CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") + TARGET_LINK_LIBRARIES (${target} mysqld ${ARG_LINK_LIBRARIES}) + ENDIF() ++ IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ SET_TARGET_PROPERTIES(${target} PROPERTIES ++ LINK_FLAGS "-L%%FREEBSD_LOCAL_LIB%% ${LINK_FLAGS} " ++ ) ++ ENDIF() + ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES}) + + IF(NOT ARG_MODULE_ONLY) +@@ -239,13 +246,17 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) ++ IF(CMAKE_BUILD_TYPE MATCHES "Debug") ++ INSTALL_DEBUG_TARGET(${target} ++ DESTINATION ${INSTALL_PLUGINDIR}/debug ++ COMPONENT ${INSTALL_COMPONENT}) ++ # Add installed files to list for RPMs ++ FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ ENDIF() + # 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" +- "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/debug/${ARG_MODULE_OUTPUT_NAME}.so\n") ++ "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n") + # For internal testing in PB2, append collections files + IF(DEFINED ENV{PB2WORKDIR}) + PLUGIN_APPEND_COLLECTIONS(${plugin}) |