diff options
| author | Mingli Yu <mingli.yu@windriver.com> | 2022-03-22 12:45:20 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2022-03-24 09:45:25 -0700 |
| commit | 17c734568ee9215030c7b1bf125f0a27839d4908 (patch) | |
| tree | 64b18cab6803b6a9ec6008f1dfa72cfb8c340730 /meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch | |
| parent | 9a7d42ec200a8ece78a23e041b3c651de66cec32 (diff) | |
| download | meta-openembedded-17c734568ee9215030c7b1bf125f0a27839d4908.tar.gz | |
mariadb: Upgrade to 10.7.3
Remove two patches which are already included in new version and rebase
one patch to new version and add lzo rdepends to fix below qa issue. [1]
ERROR: mariadb-10.7.3-r0 do_package_qa: QA Issue: /usr/lib64/plugin/provider_lzo.so contained in package mariadb-server requires liblzo2.so.2()(64bit), but no providers found in RDEPENDS:mariadb-server? [file-rdeps]
Add gnutls to depends to fix below error and fmt to depends [2]
| Could NOT find GnuTLS (missing: GNUTLS_LIBRARY GNUTLS_INCLUDE_DIR)
[1] https://github.com/MariaDB/server/commit/bf8b699f649b7f947e8ad8eeeb48c3d5f973be39
[2] https://github.com/MariaDB/server/commit/284ed643369dec9ff600bf4b2a2d9457986eda6e
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch | 82 |
1 files changed, 0 insertions, 82 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch b/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch deleted file mode 100644 index 1c76ab3918..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/c11_atomics.patch +++ /dev/null | |||
| @@ -1,82 +0,0 @@ | |||
| 1 | From 976468458d53d8bb71acf48ddfc852a60557acb9 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <vicentiu@mariadb.org> | ||
| 3 | Date: Thu, 23 Jul 2020 00:02:21 -0700 | ||
| 4 | Subject: [PATCH] Link with libatomic to enable C11 atomics support | ||
| 5 | |||
| 6 | Some architectures (mips) require libatomic to support proper | ||
| 7 | atomic operations. Check first if support is available without | ||
| 8 | linking, otherwise use the library. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
| 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 13 | --- | ||
| 14 | configure.cmake | 20 +++++++++++++++++++- | ||
| 15 | mysys/CMakeLists.txt | 4 ++++ | ||
| 16 | sql/CMakeLists.txt | 4 ++++ | ||
| 17 | 3 files changed, 27 insertions(+), 1 deletion(-) | ||
| 18 | |||
| 19 | diff --git a/configure.cmake b/configure.cmake | ||
| 20 | index 4fc324a9..23a2ea91 100644 | ||
| 21 | --- a/configure.cmake | ||
| 22 | +++ b/configure.cmake | ||
| 23 | @@ -862,7 +862,25 @@ int main() | ||
| 24 | long long int *ptr= &var; | ||
| 25 | return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | ||
| 26 | }" | ||
| 27 | -HAVE_GCC_C11_ATOMICS) | ||
| 28 | +HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) | ||
| 29 | +IF (HAVE_GCC_C11_ATOMICS_WITHOUT_LIBATOMIC) | ||
| 30 | + SET(HAVE_GCC_C11_ATOMICS True) | ||
| 31 | +ELSE() | ||
| 32 | + SET(OLD_CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) | ||
| 33 | + LIST(APPEND CMAKE_REQUIRED_LIBRARIES "atomic") | ||
| 34 | + CHECK_CXX_SOURCE_COMPILES(" | ||
| 35 | + int main() | ||
| 36 | + { | ||
| 37 | + long long int var= 1; | ||
| 38 | + long long int *ptr= &var; | ||
| 39 | + return (int)__atomic_load_n(ptr, __ATOMIC_SEQ_CST); | ||
| 40 | + }" | ||
| 41 | + HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | ||
| 42 | + IF(HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | ||
| 43 | + SET(HAVE_GCC_C11_ATOMICS True) | ||
| 44 | + ENDIF() | ||
| 45 | + SET(CMAKE_REQUIRED_LIBRARIES ${OLD_CMAKE_REQUIRED_LIBRARIES}) | ||
| 46 | +ENDIF() | ||
| 47 | |||
| 48 | IF(WITH_VALGRIND) | ||
| 49 | SET(HAVE_valgrind 1) | ||
| 50 | diff --git a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt | ||
| 51 | index 6aab788f..91b9c393 100644 | ||
| 52 | --- a/mysys/CMakeLists.txt | ||
| 53 | +++ b/mysys/CMakeLists.txt | ||
| 54 | @@ -154,6 +154,10 @@ TARGET_LINK_LIBRARIES(mysys dbug strings ${ZLIB_LIBRARY} | ||
| 55 | ${LIBNSL} ${LIBM} ${LIBRT} ${CMAKE_DL_LIBS} ${LIBSOCKET} ${LIBEXECINFO}) | ||
| 56 | DTRACE_INSTRUMENT(mysys) | ||
| 57 | |||
| 58 | +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | ||
| 59 | + TARGET_LINK_LIBRARIES(mysys atomic) | ||
| 60 | +ENDIF() | ||
| 61 | + | ||
| 62 | IF(HAVE_BFD_H) | ||
| 63 | TARGET_LINK_LIBRARIES(mysys bfd) | ||
| 64 | ENDIF(HAVE_BFD_H) | ||
| 65 | diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt | ||
| 66 | index b9cd418f..d42e5017 100644 | ||
| 67 | --- a/sql/CMakeLists.txt | ||
| 68 | +++ b/sql/CMakeLists.txt | ||
| 69 | @@ -222,6 +222,10 @@ ELSE() | ||
| 70 | SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) | ||
| 71 | ENDIF() | ||
| 72 | |||
| 73 | +IF (HAVE_GCC_C11_ATOMICS_WITH_LIBATOMIC) | ||
| 74 | + TARGET_LINK_LIBRARIES(sql atomic) | ||
| 75 | +ENDIF() | ||
| 76 | + | ||
| 77 | IF(MSVC OR CMAKE_SYSTEM_NAME MATCHES AIX) | ||
| 78 | SET(libs_to_export_symbols sql mysys dbug strings) | ||
| 79 | # Create shared library of already compiled object | ||
| 80 | -- | ||
| 81 | 2.25.1 | ||
| 82 | |||
