This is an automated email from the ASF dual-hosted git repository. alexey pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/kudu.git
commit c188216e0df750aa2b38ff15f0ded2b2b3920f19 Author: Alexey Serbin <[email protected]> AuthorDate: Wed Jan 15 16:46:11 2025 -0800 [thirdparty] fix RocksDB to compile with GCC13 Change-Id: Ic68e62aca998c6a39245b27b438cb2e07f5ad43d Reviewed-on: http://gerrit.cloudera.org:8080/22357 Tested-by: Alexey Serbin <[email protected]> Reviewed-by: Abhishek Chennaka <[email protected]> --- thirdparty/download-thirdparty.sh | 5 ++-- thirdparty/patches/rocksdb-gcc13.patch | 45 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh index e14f0d7bc..4d2de4663 100755 --- a/thirdparty/download-thirdparty.sh +++ b/thirdparty/download-thirdparty.sh @@ -482,11 +482,12 @@ fetch_and_patch \ $RANGER_KMS_SOURCE \ $RANGER_KMS_PATCHLEVEL -ROCKSDB_PATCHLEVEL=0 +ROCKSDB_PATCHLEVEL=1 fetch_and_patch \ $ROCKSDB_NAME.tar.gz \ $ROCKSDB_SOURCE \ - $ROCKSDB_PATCHLEVEL + $ROCKSDB_PATCHLEVEL \ + "patch -p1 < $TP_DIR/patches/rocksdb-gcc13.patch" echo "---------------" echo "Thirdparty dependencies downloaded successfully" diff --git a/thirdparty/patches/rocksdb-gcc13.patch b/thirdparty/patches/rocksdb-gcc13.patch new file mode 100644 index 000000000..40f7c87a6 --- /dev/null +++ b/thirdparty/patches/rocksdb-gcc13.patch @@ -0,0 +1,45 @@ +commit 88edfbfb5e1cac228f7cc31fbec24bb637fe54b1 +Author: Heiko Becker <[email protected]> +Date: Wed Jan 25 14:30:32 2023 -0800 + + Fix build with gcc 13 by including <cstdint> (#11118) + + Summary: + 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 + + Pull Request resolved: https://github.com/facebook/rocksdb/pull/11118 + + Reviewed By: cbi42 + + Differential Revision: D42711356 + + Pulled By: ajkr + + fbshipit-source-id: 5ea257b85b7017f40fd8fdbce965336da95c55b2 + +diff --git a/table/block_based/data_block_hash_index.h b/table/block_based/data_block_hash_index.h +index f356395f3..321522175 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 55d106fff..11178fd1d 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>
