rocksdb: Upgrade to 7.9.2

Refresh patches

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj 2023-01-25 20:28:51 -08:00
parent ad2a76cf36
commit b5d0bba011
5 changed files with 6 additions and 6 deletions

View File

@ -37,7 +37,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
+#include <cstdint>
#include <string>
#include <vector>
#include "rocksdb/status.h"
--- a/table/block_based/data_block_hash_index.h
+++ b/table/block_based/data_block_hash_index.h
@@ -5,6 +5,7 @@

View File

@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1000,7 +1000,12 @@ option(ROCKSDB_BUILD_SHARED "Build share
@@ -1057,7 +1057,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${A
if(WIN32)
set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
else()

View File

@ -13,7 +13,7 @@ Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/7541]
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,12 +153,7 @@ else()
@@ -154,12 +154,7 @@ else()
if(WITH_BZ2)
find_package(BZip2 REQUIRED)
add_definitions(-DBZIP2)

View File

@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
@@ -131,8 +131,12 @@ static inline tokutime_t toku_time_now(v
uint64_t result;
__asm __volatile__("mrs %[rt], cntvct_el0" : [ rt ] "=r"(result));
__asm __volatile__("mrs %[rt], cntvct_el0" : [rt] "=r"(result));
return result;
-#elif defined(__powerpc__)
+#elif defined(__powerpc__) && defined(__GLIBC__)

View File

@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.Apache;md5=3b83ef96387f14655fc854ddc3c6bd57 \
file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.leveldb;md5=fb04ff57a14f308f2eed4a9b87d45837"
SRCREV = "540d5aae516265170564ec27b3e67a54a11b7045"
SRCBRANCH = "7.5.fb"
SRCREV = "444b3f4845dd01b0d127c4b420fdd3b50ad56682"
SRCBRANCH = "7.9.fb"
SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=https \
file://0001-cmake-Add-check-for-atomic-support.patch \