aboutsummaryrefslogtreecommitdiffstats
path: root/main/mariadb/fix-c11-atomics-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/mariadb/fix-c11-atomics-check.patch')
-rw-r--r--main/mariadb/fix-c11-atomics-check.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/main/mariadb/fix-c11-atomics-check.patch b/main/mariadb/fix-c11-atomics-check.patch
index f98c0a20fd..0566cb8cea 100644
--- a/main/mariadb/fix-c11-atomics-check.patch
+++ b/main/mariadb/fix-c11-atomics-check.patch
@@ -45,10 +45,10 @@
SET(HAVE_valgrind 1)
--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,7 @@
ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES})
- TARGET_LINK_LIBRARIES(mysys dbug strings mysys_ssl ${ZLIB_LIBRARY}
+ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY}
- ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
+ ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBATOMIC} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY})
DTRACE_INSTRUMENT(mysys)
@@ -56,12 +56,12 @@
IF(HAVE_BFD_H)
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
-@@ -142,7 +142,7 @@
+@@ -162,7 +162,7 @@
if(WIN32)
set(SYSTEM_LIBS ${SYSTEM_LIBS} Shlwapi.lib Rpcrt4.lib)
else()
-- set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
-+ set(SYSTEM_LIBS ${LIBATOMIC} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT})
+- set(SYSTEM_LIBS ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBDL})
++ set(SYSTEM_LIBS ${LIBATOMIC} ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBDL})
endif()
set(ROCKSDB_LIBS rocksdblib})