diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-dbs/rocksdb/files')
2 files changed, 92 insertions, 0 deletions
diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch new file mode 100644 index 000000000..eccaa3a37 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-Disable-Wshadow-and-do-not-mark-default-copy-constru.patch @@ -0,0 +1,57 @@ +From ee728434124b9b7d17abbd060a62aac79a9b79c0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 12 Feb 2019 14:31:24 -0800 +Subject: [PATCH] Disable -Wshadow and do not mark default copy constructors + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + utilities/persistent_cache/block_cache_tier.h | 4 ++-- + utilities/persistent_cache/block_cache_tier_file.h | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 98e2e1973..3a24a075b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -254,7 +254,7 @@ if(FAIL_ON_WARNINGS) + if(MSVC) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + else() # assume GCC +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=shadow") + endif() + endif() + +diff --git a/utilities/persistent_cache/block_cache_tier.h b/utilities/persistent_cache/block_cache_tier.h +index 2b2c0ef4f..96d0540a4 100644 +--- a/utilities/persistent_cache/block_cache_tier.h ++++ b/utilities/persistent_cache/block_cache_tier.h +@@ -91,9 +91,9 @@ class BlockCacheTier : public PersistentCacheTier { + : key_(std::move(key)), data_(data) {} + ~InsertOp() {} + +- InsertOp() = delete; ++ InsertOp() = default; + InsertOp(InsertOp&& /*rhs*/) = default; +- InsertOp& operator=(InsertOp&& rhs) = default; ++ InsertOp& operator=(InsertOp&& rhs) = delete; + + // used for estimating size by bounded queue + size_t Size() { return data_.size() + key_.size(); } +diff --git a/utilities/persistent_cache/block_cache_tier_file.h b/utilities/persistent_cache/block_cache_tier_file.h +index e38b6c9a1..d9b89a4f7 100644 +--- a/utilities/persistent_cache/block_cache_tier_file.h ++++ b/utilities/persistent_cache/block_cache_tier_file.h +@@ -262,7 +262,7 @@ class ThreadedWriter : public Writer { + : file_(file), buf_(buf), file_off_(file_off), callback_(callback) {} + + IO(const IO&) = default; +- IO& operator=(const IO&) = default; ++ IO& operator=(const IO&) = delete; + size_t Size() const { return sizeof(IO); } + + WritableFile* file_ = nullptr; // File to write to +-- +2.20.1 + diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch new file mode 100644 index 000000000..ef0429a3c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/0001-utilities-Fix-build-failure-with-Werror-maybe-uninit.patch @@ -0,0 +1,35 @@ +From 8996f075e64da0e6ffeda57632ef31f8710defcc Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Fri, 15 Mar 2019 16:47:03 +0800 +Subject: [PATCH] utilities: Fix build failure with -Werror=maybe-uninitialized + +Summary: +Initialize magic_number to zero to avoid such failure. +utilities/blob_db/blob_log_format.cc:91:3: error: 'magic_number' may be used +uninitialized in this function [-Werror=maybe-uninitialized] + if (magic_number != kMagicNumber) { + ^~ + +Upstream-Status: Accepted [expected version 5.19] + +Signed-off-by: He Zhe <zhe.he@windriver.com> +--- + utilities/blob_db/blob_log_format.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utilities/blob_db/blob_log_format.cc b/utilities/blob_db/blob_log_format.cc +index 2bf7028..8726cb8 100644 +--- a/utilities/blob_db/blob_log_format.cc ++++ b/utilities/blob_db/blob_log_format.cc +@@ -82,7 +82,7 @@ Status BlobLogFooter::DecodeFrom(Slice src) { + uint32_t src_crc = 0; + src_crc = crc32c::Value(src.data(), BlobLogFooter::kSize - sizeof(uint32_t)); + src_crc = crc32c::Mask(src_crc); +- uint32_t magic_number; ++ uint32_t magic_number = 0; + if (!GetFixed32(&src, &magic_number) || !GetFixed64(&src, &blob_count) || + !GetFixed64(&src, &expiration_range.first) || + !GetFixed64(&src, &expiration_range.second) || !GetFixed32(&src, &crc)) { +-- +2.7.4 + |