From ad0340527c3fba4a9925ebff02ed65a93a22e4ea Mon Sep 17 00:00:00 2001
From: Colin LeMahieu <clemahieu@gmail.com>
Date: Tue, 31 Oct 2023 09:58:25 +0000
Subject: [PATCH] Update Rocksdb to v8.6.7. Convert setting of CMake variable
 PORTABLE to use 0/1 instead of OFF/ON. Reenable fail on warnings.

---
 CMakeLists.txt     | 9 ++-------
 submodules/rocksdb | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8cd2ec4..5b3d8b1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -491,18 +491,13 @@ set(WITH_TOOLS
     CACHE BOOL "" FORCE)
 if(ENABLE_AVX2)
   set(PORTABLE
-      OFF
+      0
       CACHE BOOL "" FORCE)
 else()
   set(PORTABLE
-      ON
+      1
       CACHE BOOL "" FORCE)
 endif()
-set(FAIL_ON_WARNINGS
-    OFF
-    CACHE BOOL "") # Ignore unreachable code warning in merging_iterator.cc
-                   # RocksDB v7.8.3 on Windows
-                   # https://github.com/facebook/rocksdb/issues/11072
 add_subdirectory(submodules/rocksdb EXCLUDE_FROM_ALL)
 
 include_directories(cpptoml/include)
diff --git a/submodules/rocksdb b/submodules/rocksdb
index bf2c3351..cb7a5e02 160000
--- a/submodules/rocksdb
+++ b/submodules/rocksdb
@@ -1 +1 @@
-Subproject commit bf2c335184de16a3cc1787fa97ef9f22f7114238
+Subproject commit cb7a5e02edeb883193eb5b4901d5943f58e9add9