Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 761715 | Differences between
and this patch

Collapse All | Expand All

(-)a/configure.cmake (+19 lines)
Lines 104-109 IF(UNIX) Link Here
104
  MY_SEARCH_LIBS(timer_create rt LIBRT)
104
  MY_SEARCH_LIBS(timer_create rt LIBRT)
105
  MY_SEARCH_LIBS(backtrace execinfo LIBEXECINFO)
105
  MY_SEARCH_LIBS(backtrace execinfo LIBEXECINFO)
106
106
107
  SET(ATOMIC_TEST_SOURCE "
108
  int main()
109
  {
110
    char x=1;
111
    short y=1;
112
    int z=1;
113
    long w = 1;
114
    long long s = 1;
115
    x = __atomic_add_fetch(&x, 1, __ATOMIC_SEQ_CST);
116
    y = __atomic_add_fetch(&y, 1, __ATOMIC_SEQ_CST);
117
    z = __atomic_add_fetch(&z, 1, __ATOMIC_SEQ_CST);
118
    w = __atomic_add_fetch(&w, 1, __ATOMIC_SEQ_CST);
119
    return (int)__atomic_load_n(&s, __ATOMIC_SEQ_CST);
120
  }" )
121
  CHECK_CXX_SOURCE_COMPILES("${ATOMIC_TEST_SOURCE}" ATOMICS_ARE_BUILTIN)
122
  IF(NOT ATOMICS_ARE_BUILTIN)
123
    MY_SEARCH_LIBS(atomic_thread_fence atomic LIBATOMIC)
124
  ENDIF()
125
107
  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
126
  LIST(APPEND CMAKE_REQUIRED_LIBRARIES
108
    ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBSOCKET} ${LIBDL}
127
    ${LIBM} ${LIBNSL} ${LIBBIND} ${LIBSOCKET} ${LIBDL}
109
    ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO}
128
    ${CMAKE_THREAD_LIBS_INIT} ${LIBRT} ${LIBEXECINFO}
(-)a/mysys/CMakeLists.txt (+1 lines)
Lines 185-190 ADD_CONVENIENCE_LIBRARY(mysys ${MYSYS_SOURCES} Link Here
185
  ${LIBEXECINFO}
185
  ${LIBEXECINFO}
186
  ${LIBUNWIND_LDFLAGS}
186
  ${LIBUNWIND_LDFLAGS}
187
  ${SSL_LIBRARIES}
187
  ${SSL_LIBRARIES}
188
  ${LIBATOMIC}
188
  )
189
  )
189
190
190
# For targets that link with mysys, and are independent of other targets.
191
# For targets that link with mysys, and are independent of other targets.
(-)a/router/src/harness/src/CMakeLists.txt (-2 / +1 lines)
Lines 133-139 ELSE() Link Here
133
ENDIF()
133
ENDIF()
134
134
135
SET(common_libraries ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
135
SET(common_libraries ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT}
136
  ${SHLWAPI_LIBRARIES} ${WINSOCK_LIBRARIES} ${SSL_LIBRARIES})
136
  ${SHLWAPI_LIBRARIES} ${WINSOCK_LIBRARIES} ${SSL_LIBRARIES} ${LIBATOMIC})
137
137
138
SET(INSTALL_INCLUDE_DIR "include/mysql/harness")
138
SET(INSTALL_INCLUDE_DIR "include/mysql/harness")
139
139
140
- 

Return to bug 761715