-
Notifications
You must be signed in to change notification settings - Fork 16
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
pacific: rocksdb: fix FTBFS on gcc 13
This applies three patches to the embedded rocksdb source: - facebook/rocksdb#11118 - facebook/rocksdb#11137 - A tweak to db/compaction/compaction_iteration_stats.h, lifted from https://src.fedoraproject.org/rpms/ceph/blob/rawhide/f/0024-gcc-13.patch Fixes: https://tracker.ceph.com/issues/58477 Signed-off-by: Tim Serong <tserong@suse.com>
- Loading branch information
Showing
2 changed files
with
91 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
From fe4d03d15e662a195bf28cb1327fbaeb563efb13 Mon Sep 17 00:00:00 2001 | ||
From: Heiko Becker <heirecka@exherbo.org> | ||
Date: Tue, 24 Jan 2023 16:23:03 +0100 | ||
Subject: [PATCH] Fix build with gcc 13 by including <cstdint> | ||
|
||
Like other versions before, gcc 13 moved some includes around and as a | ||
result <cstdint> is no longer transitively included [1]. Explicitly include | ||
it for uint{32,64}_t. | ||
|
||
[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
--- | ||
table/block_based/data_block_hash_index.h | 1 + | ||
util/string_util.h | 1 + | ||
2 files changed, 2 insertions(+) | ||
|
||
diff --git a/table/block_based/data_block_hash_index.h b/table/block_based/data_block_hash_index.h | ||
index f356395f329..3215221755d 100644 | ||
--- a/table/block_based/data_block_hash_index.h | ||
+++ b/table/block_based/data_block_hash_index.h | ||
@@ -5,6 +5,7 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
#include <vector> | ||
|
||
diff --git a/util/string_util.h b/util/string_util.h | ||
index 55d106fff02..11178fd1d7b 100644 | ||
--- a/util/string_util.h | ||
+++ b/util/string_util.h | ||
@@ -6,6 +6,7 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include <sstream> | ||
#include <string> | ||
#include <unordered_map> | ||
From 31012cdfa435d9203da3c3de8127b66bf018692a Mon Sep 17 00:00:00 2001 | ||
From: Khem Raj <raj.khem@gmail.com> | ||
Date: Tue, 24 Jan 2023 21:40:43 -0800 | ||
Subject: [PATCH] checkpoint.h: Add missing includes <cstdint> | ||
|
||
It uses uint64_t and it comes from <cstdint> | ||
This is needed with GCC 13 and newer [1] | ||
|
||
[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html | ||
|
||
Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
--- | ||
include/rocksdb/utilities/checkpoint.h | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/include/rocksdb/utilities/checkpoint.h b/include/rocksdb/utilities/checkpoint.h | ||
index 6046513aba4..ecf92061629 100644 | ||
--- a/include/rocksdb/utilities/checkpoint.h | ||
+++ b/include/rocksdb/utilities/checkpoint.h | ||
@@ -8,6 +8,7 @@ | ||
#pragma once | ||
#ifndef ROCKSDB_LITE | ||
|
||
+#include <cstdint> | ||
#include <string> | ||
#include <vector> | ||
|
||
--- a/db/compaction/compaction_iteration_stats.h | ||
+++ b/db/compaction/compaction_iteration_stats.h | ||
@@ -5,6 +5,7 @@ | ||
|
||
#pragma once | ||
|
||
+#include <cstdint> | ||
#include "rocksdb/rocksdb_namespace.h" | ||
|
||
struct CompactionIterationStats { | ||
--- a/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h | ||
+++ b/third-party/folly/folly/synchronization/detail/ProxyLockable-inl.h | ||
@@ -13,6 +13,7 @@ | ||
#include <memory> | ||
#include <mutex> | ||
#include <stdexcept> | ||
+#include <system_error> | ||
#include <utility> | ||
|
||
namespace folly { |