From 90660213eee7b871ab3c3aa3561376fcac4b6b48 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Fri, 2 Aug 2019 12:00:41 -0600
Subject: [PATCH] libatomic

---
 configure.cmake                     | 3 +++
 libmysqld/CMakeLists.txt            | 1 +
 sql/CMakeLists.txt                  | 3 ++-
 storage/rocksdb/build_rocksdb.cmake | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.cmake b/configure.cmake
index 8533b8ee0b2..0d7ced1a695 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -855,6 +855,8 @@ SET(SIGNAL_WITH_VIO_CLOSE 1)
 MARK_AS_ADVANCED(NO_ALARM)
 
 
+SET(SAVE_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} atomic)
 CHECK_CXX_SOURCE_COMPILES("
 int main()
 {
@@ -863,6 +865,7 @@ int main()
   return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST);
 }"
 HAVE_GCC_C11_ATOMICS)
+SET(CMAKE_REQUIRED_LIBRARIES ${SAVE_CMAKE_REQUIRED_LIBRARIES})
 
 IF(WITH_VALGRIND)
   SET(HAVE_valgrind 1)
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 9dddc8a8990..9cf0b328bab 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -162,6 +162,7 @@ SET(LIBS
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
   ${EMBEDDED_PLUGIN_LIBS}
   sql_embedded
+  atomic
 )
 
 # Some storage engine were compiled for embedded specifically
diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt
index d2180297907..3258b931324 100644
--- a/sql/CMakeLists.txt
+++ b/sql/CMakeLists.txt
@@ -196,7 +196,8 @@ TARGET_LINK_LIBRARIES(sql
   tpool
   ${LIBWRAP} ${LIBCRYPT} ${LIBDL} ${CMAKE_THREAD_LIBS_INIT}
   ${SSL_LIBRARIES}
-  ${LIBSYSTEMD})
+  ${LIBSYSTEMD}
+  atomic)
 
 IF(TARGET pcre2)
   ADD_DEPENDENCIES(sql pcre2)
diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake
index 2b4649b1fbe..688986c4deb 100644
--- a/storage/rocksdb/build_rocksdb.cmake
+++ b/storage/rocksdb/build_rocksdb.cmake
@@ -497,7 +497,7 @@ INCLUDE_DIRECTORIES(${ROCKSDB_SOURCE_DIR}/util)
 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")
   set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -Wno-error")
 endif()
-- 
2.27.0