2019-06-27 22:48:06 +00:00
|
|
|
--- libmysqld/CMakeLists.txt.orig 2019-06-17 16:00:31.000000000 -0600
|
|
|
|
|
+++ libmysqld/CMakeLists.txt 2019-06-27 12:22:55.490388083 -0600
|
|
|
|
|
@@ -154,6 +154,7 @@
|
2017-06-03 00:38:43 +00:00
|
|
|
${LIBWRAP} ${LIBCRYPT} ${LIBDL}
|
|
|
|
|
${MYSQLD_STATIC_PLUGIN_LIBS}
|
|
|
|
|
sql_embedded
|
|
|
|
|
+ atomic
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# Some storage engine were compiled for embedded specifically
|
2019-06-27 22:48:06 +00:00
|
|
|
--- sql/CMakeLists.txt.orig 2019-06-17 16:00:32.000000000 -0600
|
|
|
|
|
+++ sql/CMakeLists.txt 2019-06-27 12:22:55.490388083 -0600
|
|
|
|
|
@@ -181,7 +181,8 @@
|
2017-06-03 00:38:43 +00:00
|
|
|
${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
|
|
|
|
|
${WSREP_LIB}
|
|
|
|
|
${SSL_LIBRARIES}
|
|
|
|
|
- ${LIBSYSTEMD})
|
|
|
|
|
+ ${LIBSYSTEMD}
|
|
|
|
|
+ atomic)
|
|
|
|
|
|
|
|
|
|
IF(WIN32)
|
|
|
|
|
SET(MYSQLD_SOURCE main.cc nt_servc.cc message.rc)
|
2019-06-27 22:48:06 +00:00
|
|
|
--- storage/rocksdb/build_rocksdb.cmake.orig 2019-06-27 12:22:49.450397299 -0600
|
|
|
|
|
+++ storage/rocksdb/build_rocksdb.cmake 2019-06-27 12:22:55.494388077 -0600
|
|
|
|
|
@@ -448,7 +448,7 @@
|
2019-01-18 13:29:56 +00:00
|
|
|
list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc)
|
|
|
|
|
|
|
|
|
|
ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES})
|
|
|
|
|
-target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})
|
|
|
|
|
+target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS} atomic)
|
|
|
|
|
IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
2019-06-27 22:48:06 +00:00
|
|
|
set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp")
|
2019-01-18 13:29:56 +00:00
|
|
|
endif()
|
