diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch | 37 |
1 files changed, 26 insertions, 11 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch index 169986130..36217f9aa 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch @@ -1,7 +1,7 @@ -Author: Vicențiu Ciorbaru <vicentiu@mariadb.org> -Date: Fri Dec 21 19:14:04 2018 +0200 - - Link with libatomic to enable C11 atomics support +From 976468458d53d8bb71acf48ddfc852a60557acb9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org> +Date: Thu, 23 Jul 2020 00:02:21 -0700 +Subject: [PATCH] Link with libatomic to enable C11 atomics support Some architectures (mips) require libatomic to support proper atomic operations. Check first if support is available without @@ -9,10 +9,18 @@ Date: Fri Dec 21 19:14:04 2018 +0200 Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> +--- + configure.cmake | 20 +++++++++++++++++++- + mysys/CMakeLists.txt | 4 ++++ + sql/CMakeLists.txt | 4 ++++ + 3 files changed, 27 insertions(+), 1 deletion(-) +diff --git a/configure.cmake b/configure.cmake +index a355214..6ee595f 100644 --- a/configure.cmake +++ b/configure.cmake -@@ -926,7 +926,25 @@ int main() +@@ -865,7 +865,25 @@ int main() long long int *ptr= &var; return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); }" @@ -39,10 +47,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> IF(WITH_VALGRIND) SET(HAVE_valgrind 1) +diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt +index 3d8a20e..42f1441 100644 --- a/mysys/CMakeLists.txt +++ b/mysys/CMakeLists.txt -@@ -78,6 +78,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings - ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO} ${CRC32_LIBRARY}) +@@ -129,6 +129,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} + ${LIBNSL} ${LIBM} ${LIBRT} ${LIBDL} ${LIBSOCKET} ${LIBEXECINFO}) DTRACE_INSTRUMENT(mysys) +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) @@ -52,9 +62,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> IF(HAVE_BFD_H) TARGET_LINK_LIBRARIES(mysys bfd) ENDIF(HAVE_BFD_H) +diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt +index 616017b..53575f6 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt -@@ -178,6 +178,10 @@ ELSE() +@@ -219,6 +219,10 @@ ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() @@ -62,6 +74,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> + TARGET_LINK_LIBRARIES(sql atomic) +ENDIF() + - - IF(MSVC AND NOT WITHOUT_DYNAMIC_PLUGINS) - + IF(MSVC) + SET(libs_to_export_symbols sql mysys dbug strings) + # Create shared library of already compiled object +-- +2.17.1 + |