summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2019-03-04 21:28:58 -0800
committerKhem Raj <raj.khem@gmail.com>2019-03-06 11:31:36 -0800
commit8f817f91a30a9c1d491bbd40f102f416b4348ddb (patch)
tree54cf9b63b424279090aaa157e9a2804ea3450760 /meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
parent70ccd088eac1ebf45d53b2d0fc9ac211a3905ade (diff)
downloadmeta-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/configure.cmake-fix-valgrind.patch')
-rw-r--r--meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch27
1 files changed, 13 insertions, 14 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
index e97def6021..ac94279585 100644
--- a/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
+++ b/meta-oe/recipes-dbs/mysql/mariadb/configure.cmake-fix-valgrind.patch
@@ -1,6 +1,6 @@
1From 5effba0d7d47071a3f1bca56823190d5a95bb1a6 Mon Sep 17 00:00:00 2001 1From 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com> 2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Wed, 12 Nov 2014 03:09:10 -0500 3Date: Tue, 26 Feb 2019 23:57:06 -0800
4Subject: [PATCH] configure.cmake: fix valgrind 4Subject: [PATCH] configure.cmake: fix valgrind
5 5
6Check valgrind headers only if WITH_VALGRIND is set. 6Check valgrind headers only if WITH_VALGRIND is set.
@@ -15,27 +15,26 @@ PACKAGECONFIG to decide if valgrind is needed or not.
15Upstream-Status: Inappropriate [oe specific] 15Upstream-Status: Inappropriate [oe specific]
16 16
17Signed-off-by: Jackie Huang <jackie.huang@windriver.com> 17Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
18Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
19
18--- 20---
19 configure.cmake | 4 ++-- 21 configure.cmake | 5 ++---
20 1 file changed, 2 insertions(+), 2 deletions(-) 22 1 file changed, 2 insertions(+), 3 deletions(-)
21 23
22diff --git a/configure.cmake b/configure.cmake 24diff --git a/configure.cmake b/configure.cmake
23index 0bd7bbe..51a098f 100644 25index 3cfc4b31..d017b3b3 100644
24--- a/configure.cmake 26--- a/configure.cmake
25+++ b/configure.cmake 27+++ b/configure.cmake
26@@ -1047,10 +1047,10 @@ MARK_AS_ADVANCED(WITH_ATOMIC_LOCKS MY_ATOMIC_MODE_RWLOCK MY_ATOMIC_MODE_DUMMY) 28@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS)
27 29
28 IF(WITH_VALGRIND) 30 IF(WITH_VALGRIND)
29 SET(HAVE_valgrind 1) 31 SET(HAVE_valgrind 1)
30+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 32-ENDIF()
31+ HAVE_VALGRIND) 33-
32 ENDIF()
33
34-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h" 34-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
35- HAVE_VALGRIND) 35+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
36 HAVE_VALGRIND_MEMCHECK_H)
37+ENDIF()
36 38
37 #-------------------------------------------------------------------- 39 #--------------------------------------------------------------------
38 # Check for IPv6 support 40 # Check for IPv6 support
39--
402.0.0
41