diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2019-03-04 21:28:58 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-03-06 11:31:36 -0800 |
commit | 8f817f91a30a9c1d491bbd40f102f416b4348ddb (patch) | |
tree | 54cf9b63b424279090aaa157e9a2804ea3450760 /meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch | |
parent | 70ccd088eac1ebf45d53b2d0fc9ac211a3905ade (diff) | |
download | meta-openembedded-8f817f91a30a9c1d491bbd40f102f416b4348ddb.tar.gz |
mariadb: Upgrade to 10.3.13
Per https://mariadb.org/about/maintenance-policy/,
mariadb 5.5.x series only supported until next year
April 2020, so upgrade it to 10.3.13.
Remove some deprecated patches, add some
new patches to fix build failure and rework
two patches to avoid fuzz warnings.
Add -latomic to linker flags for armv5
Use -pthread to link for mussing atomic symbols on arches e.g. riscv
Fixes issues like
ld.bfd: librocksdblib.a(memtable.cc.o):/usr/include/c++/9.0.1/bits/atomic_base.h:438: more undefined references to `__atomic_compare_exchange_1' follow
Fix build with musl
add libxml2 to depends
Fix build with clang
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/fix-cmake-module-path.patch')
-rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch deleted file mode 100644 index 8d9f558d05..0000000000 --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-cmake-module-path.patch +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | Avoid CMAKE_MODULE_PATH being overwritten | ||
2 | |||
3 | OE-Core's setting of CMAKE_MODULE_PATH stomps on MariaDB's value unless | ||
4 | we set it after setting the project name. | ||
5 | |||
6 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
7 | |||
8 | Upstream-Status: Inappropriate [working around OE-Core bug] | ||
9 | |||
10 | --- mariadb/CMakeLists.txt 2014-07-17 11:01:07.676353047 +0100 | ||
11 | +++ mariadb/CMakeLists.txt 2014-07-17 11:01:31.299353107 +0100 | ||
12 | @@ -28,8 +28,6 @@ | ||
13 | |||
14 | MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}") | ||
15 | |||
16 | -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) | ||
17 | - | ||
18 | # Distinguish between community and non-community builds, with the | ||
19 | # default being a community build. This does not impact the feature | ||
20 | # set that will be compiled in; it's merely provided as a hint to | ||
21 | @@ -77,6 +75,8 @@ | ||
22 | ENDIF() | ||
23 | PROJECT(${MYSQL_PROJECT_NAME}) | ||
24 | |||
25 | +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) | ||
26 | + | ||
27 | IF(BUILD_CONFIG) | ||
28 | INCLUDE( | ||
29 | ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake) | ||