diff options
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch')
-rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch index 36217f9aa..32c9818ab 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch | |||
@@ -17,10 +17,10 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | |||
17 | 3 files changed, 27 insertions(+), 1 deletion(-) | 17 | 3 files changed, 27 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | diff --git a/configure.cmake b/configure.cmake | 19 | diff --git a/configure.cmake b/configure.cmake |
20 | index a355214..6ee595f 100644 | 20 | index bb3ad43..2ff4f19 100644 |
21 | --- a/configure.cmake | 21 | --- a/configure.cmake |
22 | +++ b/configure.cmake | 22 | +++ b/configure.cmake |
23 | @@ -865,7 +865,25 @@ int main() | 23 | @@ -861,7 +861,25 @@ int main() |
24 | long long int *ptr= &var; | 24 | long long int *ptr= &var; |
25 | return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | 25 | return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); |
26 | }" | 26 | }" |
@@ -48,11 +48,11 @@ index a355214..6ee595f 100644 | |||
48 | IF(WITH_VALGRIND) | 48 | IF(WITH_VALGRIND) |
49 | SET(HAVE_valgrind 1) | 49 | SET(HAVE_valgrind 1) |
50 | diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt | 50 | diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt |
51 | index 3d8a20e..42f1441 100644 | 51 | index 6a3a1ef..e306ae7 100644 |
52 | --- a/mysys/CMakeLists.txt | 52 | --- a/mysys/CMakeLists.txt |
53 | +++ b/mysys/CMakeLists.txt | 53 | +++ b/mysys/CMakeLists.txt |
54 | @@ -129,6 +129,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} | 54 | @@ -140,6 +140,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} |
55 | ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO}) | 55 | ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) |
56 | DTRACE_INSTRUMENT(mysys) | 56 | DTRACE_INSTRUMENT(mysys) |
57 | 57 | ||
58 | +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | 58 | +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) |
@@ -63,10 +63,10 @@ index 3d8a20e..42f1441 100644 | |||
63 | TARGET_LINK_LIBRARIES(mysys bfd) | 63 | TARGET_LINK_LIBRARIES(mysys bfd) |
64 | ENDIF(HAVE_BFD_H) | 64 | ENDIF(HAVE_BFD_H) |
65 | diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt | 65 | diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt |
66 | index 616017b..53575f6 100644 | 66 | index 4978d01..883a930 100644 |
67 | --- a/sql/CMakeLists.txt | 67 | --- a/sql/CMakeLists.txt |
68 | +++ b/sql/CMakeLists.txt | 68 | +++ b/sql/CMakeLists.txt |
69 | @@ -219,6 +219,10 @@ ELSE() | 69 | @@ -220,6 +220,10 @@ ELSE() |
70 | SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) | 70 | SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) |
71 | ENDIF() | 71 | ENDIF() |
72 | 72 | ||