From 6ea0cec2274d5e2c413c34b8d8acd6b38b2def39 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 24 Oct 2025 10:31:31 -0700 Subject: [PATCH] mariadb: Fix build with musl/gcc-15 Add cstdint for uint_64_t for more files Signed-off-by: Khem Raj --- ...-missing-includes-cstdint-and-cstdio.patch | 40 ++++++++++++++----- 1 file changed, 30 insertions(+), 10 deletions(-) diff --git a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch index bc1b992919..4bbdd8c7eb 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch +++ b/meta-oe/recipes-dbs/mysql/mariadb/0001-Add-missing-includes-cstdint-and-cstdio.patch @@ -17,8 +17,6 @@ Signed-off-by: Mingli Yu storage/rocksdb/rocksdb/util/string_util.h | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) -diff --git a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h -index 7fb9d489..f7b4e6f0 100644 --- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h +++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/checkpoint.h @@ -8,6 +8,7 @@ @@ -29,8 +27,6 @@ index 7fb9d489..f7b4e6f0 100644 #include #include #include "rocksdb/status.h" -diff --git a/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h b/storage/rocksdb/rocksdb/table/block_based/data_block_hash_index.h -index f356395f..32152217 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 @@ @@ -41,8 +37,6 @@ index f356395f..32152217 100644 #include #include -diff --git a/storage/rocksdb/rocksdb/util/slice.cc b/storage/rocksdb/rocksdb/util/slice.cc -index 3c3656de..b18d7f5d 100644 --- a/storage/rocksdb/rocksdb/util/slice.cc +++ b/storage/rocksdb/rocksdb/util/slice.cc @@ -12,7 +12,7 @@ @@ -54,8 +48,6 @@ index 3c3656de..b18d7f5d 100644 #include "rocksdb/convenience.h" #include "rocksdb/slice_transform.h" #include "rocksdb/utilities/object_registry.h" -diff --git a/storage/rocksdb/rocksdb/util/string_util.h b/storage/rocksdb/rocksdb/util/string_util.h -index 7794dbb0..b480177e 100644 --- a/storage/rocksdb/rocksdb/util/string_util.h +++ b/storage/rocksdb/rocksdb/util/string_util.h @@ -6,6 +6,7 @@ @@ -66,5 +58,33 @@ index 7794dbb0..b480177e 100644 #include #include #include --- -2.40.0 +--- a/storage/rocksdb/rocksdb/include/rocksdb/trace_record.h ++++ b/storage/rocksdb/rocksdb/include/rocksdb/trace_record.h +@@ -5,6 +5,7 @@ + + #pragma once + ++#include + #include + #include + #include +--- a/storage/rocksdb/rocksdb/db/blob/blob_file_meta.h ++++ b/storage/rocksdb/rocksdb/db/blob/blob_file_meta.h +@@ -6,6 +6,7 @@ + #pragma once + + #include ++#include + #include + #include + #include +--- a/storage/rocksdb/rocksdb/include/rocksdb/utilities/transaction_db_mutex.h ++++ b/storage/rocksdb/rocksdb/include/rocksdb/utilities/transaction_db_mutex.h +@@ -6,6 +6,7 @@ + #pragma once + #ifndef ROCKSDB_LITE + ++#include + #include + + #include "rocksdb/status.h"