mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-02 02:38:48 +00:00
8f817f91a3
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>
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
From 24e2b0edc2612acefcc48414bb6f0aeb086061a9 Mon Sep 17 00:00:00 2001
|
|
From: Jackie Huang <jackie.huang@windriver.com>
|
|
Date: Tue, 26 Feb 2019 23:57:06 -0800
|
|
Subject: [PATCH] configure.cmake: fix valgrind
|
|
|
|
Check valgrind headers only if WITH_VALGRIND is set.
|
|
|
|
mariadb uses two macros for valgrind compilations:
|
|
HAVE_valgrind - valgrind is installed and can be set by configure option -DWITH_VALGRIND
|
|
HAVE_VALGRIND - valgrind debug libraries is installed, set by auto check
|
|
|
|
We would like to set them both by the configure option so that we can use
|
|
PACKAGECONFIG to decide if valgrind is needed or not.
|
|
|
|
Upstream-Status: Inappropriate [oe specific]
|
|
|
|
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
|
|
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
|
|
|
|
---
|
|
configure.cmake | 5 ++---
|
|
1 file changed, 2 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/configure.cmake b/configure.cmake
|
|
index 3cfc4b31..d017b3b3 100644
|
|
--- a/configure.cmake
|
|
+++ b/configure.cmake
|
|
@@ -930,10 +930,9 @@ HAVE_GCC_C11_ATOMICS)
|
|
|
|
IF(WITH_VALGRIND)
|
|
SET(HAVE_valgrind 1)
|
|
-ENDIF()
|
|
-
|
|
-CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
|
|
+ CHECK_INCLUDE_FILES("valgrind/memcheck.h;valgrind/valgrind.h"
|
|
HAVE_VALGRIND_MEMCHECK_H)
|
|
+ENDIF()
|
|
|
|
#--------------------------------------------------------------------
|
|
# Check for IPv6 support
|