diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2019-12-28 12:42:27 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2019-12-29 10:32:10 -0800 |
| commit | 81072061635a20789a4f084f94cea699a47c8580 (patch) | |
| tree | 6248f66d491e42a940e1f12c6486631b9f034642 /meta-oe/recipes-dbs/mysql/mariadb | |
| parent | 8b80ce4fdd56f741361952785d23a9df09edecc3 (diff) | |
| download | meta-openembedded-81072061635a20789a4f084f94cea699a47c8580.tar.gz | |
mariadb: Upgrade to 10.4.11
Backport a rocksdb patch to fix clang error
Refresh existing patches as needed
Switch SRC_URI to downloads.mariadb.org since archive.mariadb.org is too
slow if no mirrors are used
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-dbs/mysql/mariadb')
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch | 9 |
2 files changed, 34 insertions, 7 deletions
diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch new file mode 100644 index 0000000000..87c70617a1 --- /dev/null +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Fix-build-breakage-from-lock_guard-error-6161.patch @@ -0,0 +1,32 @@ +Subject: [PATCH] Fix build breakage from lock_guard error (#6161) + +Summary: +This change fixes a source issue that caused compile time error which +breaks build for many fbcode services in that setup. The size() member +function of channel is a const member, so member variables accessed +within it are implicitly const as well. This caused error when clang +fails to resolve to a constructor that takes std::mutex because the +suitable constructor got rejected due to loss of constness for its +argument. The fix is to add mutable modifier to the lock_ member of +channel. + +Pull Request resolved: https://github.com/facebook/rocksdb/pull/6161 + +Differential Revision: D18967685 + +Pulled By: maysamyabandeh + +Upstream-Status: Backport + +fbshipit-source-id:698b6a5153c3c92eeacb842c467aa28cc350d432 +--- a/storage/rocksdb/rocksdb/util/channel.h ++++ b/storage/rocksdb/rocksdb/util/channel.h +@@ -60,7 +60,7 @@ class channel { + + private: + std::condition_variable cv_; +- std::mutex lock_; ++ mutable std::mutex lock_; + std::queue<T> buffer_; + bool eof_; + }; diff --git a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch index 34d31148b4..185b7b77ff 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/fix-arm-atomic.patch @@ -15,11 +15,9 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> storage/rocksdb/build_rocksdb.cmake | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/storage/rocksdb/build_rocksdb.cmake b/storage/rocksdb/build_rocksdb.cmake -index c36c761..2b539ff 100644 --- a/storage/rocksdb/build_rocksdb.cmake +++ b/storage/rocksdb/build_rocksdb.cmake -@@ -424,6 +424,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINARY_DIR}/build_version.cc) +@@ -470,6 +470,9 @@ list(APPEND SOURCES ${CMAKE_CURRENT_BINA ADD_CONVENIENCE_LIBRARY(rocksdblib ${SOURCES}) target_link_libraries(rocksdblib ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) @@ -27,8 +25,5 @@ index c36c761..2b539ff 100644 + TARGET_LINK_LIBRARIES(rocksdblib atomic) +ENDIF() IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") - set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp -frtti") + set_target_properties(rocksdblib PROPERTIES COMPILE_FLAGS "-fPIC -fno-builtin-memcmp") endif() --- -2.17.1 - |