From 2f62fc1b4caf830a0d7a0c0ee1aaea4fd728616c Mon Sep 17 00:00:00 2001 From: oreo639 Date: Thu, 25 Jan 2024 13:42:34 -0800 Subject: [PATCH] mariadb: fix build with gcc13 and musl --- srcpkgs/mariadb/patches/fix-gcc13.patch | 85 +++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 srcpkgs/mariadb/patches/fix-gcc13.patch diff --git a/srcpkgs/mariadb/patches/fix-gcc13.patch b/srcpkgs/mariadb/patches/fix-gcc13.patch new file mode 100644 index 00000000000..e348992b45d --- /dev/null +++ b/srcpkgs/mariadb/patches/fix-gcc13.patch @@ -0,0 +1,85 @@ +From 88edfbfb5e1cac228f7cc31fbec24bb637fe54b1 Mon Sep 17 00:00:00 2001 +From: Heiko Becker +Date: Wed, 25 Jan 2023 14:30:32 -0800 +Subject: [PATCH] Fix build with gcc 13 by including (#11118) + +Summary: +Like other versions before, gcc 13 moved some includes around and as a result 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 +--- + 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/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h ++++ b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include + #include + +diff --git a/util/string_util.h b/util/string_util.h +index 55d106fff02..11178fd1d7b 100644 +--- a/storage/rocksdb/rocksdb/util/string_util.h ++++ b/storage/rocksdb/rocksdb/util/string_util.h +@@ -6,6 +6,7 @@ + + #pragma once + ++#include + #include + #include + #include +From 31012cdfa435d9203da3c3de8127b66bf018692a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 24 Jan 2023 21:40:43 -0800 +Subject: [PATCH] checkpoint.h: Add missing includes + +It uses uint64_t and it comes from +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 +--- + 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/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h ++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +@@ -8,6 +8,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include + #include + #include + +--- a/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h ++++ b/storage/rocksdb/rocksdb/db/compaction/compaction_iteration_stats.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include "rocksdb/rocksdb_namespace.h" + + struct CompactionIterationStats {