summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2023-05-04 16:05:08 +0200
committerSergei Golubchik <serg@mariadb.org>2023-05-04 16:07:44 +0200
commitcf4a16b5557be5fb3568c1de0d6cc0a18291afc9 (patch)
treeb024fe0983b9e8eb1f9fdafd9eb15256ecb0d629
parent4d6e458f9f3956931b7c4c093fb9a0775faa9931 (diff)
downloadmariadb-git-cf4a16b5557be5fb3568c1de0d6cc0a18291afc9.tar.gz
MDEV-31057 rocksdb does not compile with gcc-13
RocksDB (in a submodule) has to include <cstdint> to use uint64_t but it doesn't. Until the submodule is upgraded, let's replace problematic types with something that's available
-rw-r--r--storage/rocksdb/CMakeLists.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/rocksdb/CMakeLists.txt b/storage/rocksdb/CMakeLists.txt
index 15fc4dc735a..71259703e5a 100644
--- a/storage/rocksdb/CMakeLists.txt
+++ b/storage/rocksdb/CMakeLists.txt
@@ -30,6 +30,11 @@ IF(WITH_VALGRIND)
ADD_DEFINITIONS(-DROCKSDB_VALGRIND_RUN=1)
ENDIF()
+ADD_DEFINITIONS(-Duint64_t=u_int64_t)
+ADD_DEFINITIONS(-Duint32_t=u_int32_t)
+ADD_DEFINITIONS(-Duint16_t=u_int16_t)
+ADD_DEFINITIONS(-Duint8_t=u_int8_t)
+
# We've had our builders hang during the build process. This prevents MariaRocks
# to be built on 32 bit intel OS kernels.
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "i[36]86")