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-a-building-failure.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-a-building-failure.patch')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch index 0c4e10237c..9149ee21f2 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-a-building-failure.patch | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | [PATCH] fix a building failure | 1 | From 1b2b6a61c9f82157cd2e0c3744f6c07e07aeb0bd Mon Sep 17 00:00:00 2001 |
| 2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
| 3 | Date: Mon, 4 Mar 2019 01:11:30 -0800 | ||
| 4 | Subject: [PATCH] fix a building failure | ||
| 2 | 5 | ||
| 3 | Upstream-Status: Inappropriate [configuration] | 6 | Upstream-Status: Inappropriate [configuration] |
| 4 | 7 | ||
| @@ -6,17 +9,18 @@ building failed since native does not generate import_executables.cmake | |||
| 6 | In fact, our building system will export the needed commands | 9 | In fact, our building system will export the needed commands |
| 7 | 10 | ||
| 8 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | 11 | Signed-off-by: Roy Li <rongqing.li@windriver.com> |
| 12 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
| 9 | --- | 13 | --- |
| 10 | CMakeLists.txt | 5 ----- | 14 | CMakeLists.txt | 5 ----- |
| 11 | 1 file changed, 5 deletions(-) | 15 | 1 file changed, 5 deletions(-) |
| 12 | 16 | ||
| 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 17 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 14 | index c1ce1c5..83b3a7e 100644 | 18 | index fc30750..4f9110e 100644 |
| 15 | --- a/CMakeLists.txt | 19 | --- a/CMakeLists.txt |
| 16 | +++ b/CMakeLists.txt | 20 | +++ b/CMakeLists.txt |
| 17 | @@ -350,11 +350,6 @@ MYSQL_CHECK_READLINE() | 21 | @@ -347,11 +347,6 @@ CHECK_PCRE() |
| 18 | 22 | ||
| 19 | CHECK_JEMALLOC() | 23 | CHECK_SYSTEMD() |
| 20 | 24 | ||
| 21 | -IF(CMAKE_CROSSCOMPILING) | 25 | -IF(CMAKE_CROSSCOMPILING) |
| 22 | - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") | 26 | - SET(IMPORT_EXECUTABLES "IMPORTFILE-NOTFOUND" CACHE FILEPATH "Path to import_executables.cmake from a native build") |
| @@ -24,8 +28,8 @@ index c1ce1c5..83b3a7e 100644 | |||
| 24 | -ENDIF() | 28 | -ENDIF() |
| 25 | - | 29 | - |
| 26 | # | 30 | # |
| 27 | # Setup maintainer mode options by the end. Platform checks are | 31 | # Setup maintainer mode options. Platform checks are |
| 28 | # not run with the warning options as to not perturb fragile checks | 32 | # not run with the warning options as to not perturb fragile checks |
| 29 | -- | 33 | -- |
| 30 | 1.9.1 | 34 | 2.17.1 |
| 31 | 35 | ||
