[patch] mysql-8.0.27-link-libatomic.patch

mysql-8.0.27-link-libatomic.patch (text/plain), 2.00 KB, created by Alex Fan on 2022-02-01 00:04:58 UTC

https://bugs.gentoo.org/761715
https://github.com/MariaDB/server/pull/1974

From: alexfanqi <[e-mail]>
Date: Tue, 1 Feb 2022 10:41:26 +1100
Subject: [PATCH] link with libatomic when necessary

Signed-off-by: alexfanqi <[e-mail]>
---
 configure.cmake                       | 19 +++++++++++++++++++
 mysys/CMakeLists.txt                  |  1 +
 router/src/harness/src/CMakeLists.txt |  2 +-
 3 files changed, 21 insertions(+), 1 deletion(-)

--- a/configure.cmake
+++ b/configure.cmake
@@ -104,6 +104,25 @@ IF(UNIX)
   MY_SEARCH_LIBS(timer_create rt LIBRT)
   MY_SEARCH_LIBS(backtrace execinfo LIBEXECINFO)
 
+  SET(ATOMIC_TEST_SOURCE "
+  int main()
+  {
+    char x=1;
+    short y=1;
+    int z=1;
+    long w = 1;
+    long long s = 1;
+    x = __atomic_add_fetch(&x, 1, __ATOMIC_SEQ_CST);
+    y = __atomic_add_fetch(&y, 1, __ATOMIC_SEQ_CST);
+    z = __atomic_add_fetch(&z, 1, __ATOMIC_SEQ_CST);
+    w = __atomic_add_fetch(&w, 1, __ATOMIC_SEQ_CST);
+    return (int)__atomic_load_n(&s, __ATOMIC_SEQ_CST);
+  }" )
+  CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_ARE_BUILTIN)
+  IF(NOT ATOMICS_ARE_BUILTIN)
+    MY_SEARCH_LIBS(atomic_thread_fence atomic LIBATOMIC)
+  ENDIF()
+
   LIST(APPEND CMAKE_REQUIRED_LIBRARIES
     ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBSOCKET} ${LIBDL}
     ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO}

--- a/mysys/CMakeLists.txt
+++ b/mysys/CMakeLists.txt
@@ -185,6 +185,7 @@ ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES}
   ${LIBEXECINFO}
   ${LIBUNWIND_LDFLAGS}
   ${SSL_LIBRARIES}
+  ${LIBATOMIC}
   )
 
 # For targets that link with mysys, and are independent of other targets.

--- a/router/src/harness/src/CMakeLists.txt
+++ b/router/src/harness/src/CMakeLists.txt
@@ -133,7 +133,7 @@ ELSE()
 ENDIF()
 
 SET(common_libraries ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
-  ${SHLWAPI_LIBRARIES} ${WINSOCK_LIBRARIES} ${SSL_LIBRARIES})
+  ${SHLWAPI_LIBRARIES} ${WINSOCK_LIBRARIES} ${SSL_LIBRARIES} ${LIBATOMIC})
 
 SET(INSTALL_INCLUDE_DIR "include/mysql/harness")
 
-- 
2.25.1