mirror of
https://github.com/thead-yocto-mirror/meta-openembedded
synced 2026-09-18 13:11:57 +02: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>
33 lines
938 B
Diff
33 lines
938 B
Diff
libc++ also has a file called version and this file and how cflags are specified
|
|
it ends up including this file and resulting in compile errors
|
|
|
|
fixes errors like
|
|
storage/mroonga/version:1:1: error: expected unqualified-id
|
|
7.07
|
|
^
|
|
|
|
Upstream-Status: Pending
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
|
|
--- a/storage/mroonga/CMakeLists.txt
|
|
+++ b/storage/mroonga/CMakeLists.txt
|
|
@@ -80,7 +80,7 @@ else()
|
|
set(MRN_SOURCE_DIR ${CMAKE_SOURCE_DIR})
|
|
endif()
|
|
|
|
-file(READ ${MRN_SOURCE_DIR}/version MRN_VERSION)
|
|
+file(READ ${MRN_SOURCE_DIR}/ver MRN_VERSION)
|
|
file(READ ${MRN_SOURCE_DIR}/version_major MRN_VERSION_MAJOR)
|
|
file(READ ${MRN_SOURCE_DIR}/version_minor MRN_VERSION_MINOR)
|
|
file(READ ${MRN_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)
|
|
--- /dev/null
|
|
+++ b/storage/mroonga/ver
|
|
@@ -0,0 +1 @@
|
|
+7.07
|
|
\ No newline at end of file
|
|
--- a/storage/mroonga/version
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-7.07
|
|
\ No newline at end of file
|