From f481452b48850691726f2cdd84e2f9f4ccaa936e Mon Sep 17 00:00:00 2001
From: Alex Hornby <alex@hornby.org.uk>
Date: Tue, 21 Nov 2023 20:33:33 -0800
Subject: [PATCH] fix eden fs build with GCC 13.2.1

Summary:
X-link: https://github.com/facebookincubator/velox/pull/7070

fix eden fs build with GCC 13.2.1

Fixing two problems that broke builds on Fedora 38, which comes with GCC 13.2.1

   * GCC 13.2.1 can't build the old rocksdb, so update the version
   * there was a missing include in BackingStoreType.h

X-link: https://github.com/facebook/sapling/pull/748

Reviewed By: mitrandir77

Differential Revision: D50313436

Pulled By: genevievehelsel

fbshipit-source-id: 970227f29641768c8314aa0537654470d097d7bf
---
 build/fbcode_builder/manifests/rocksdb | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/build/fbcode_builder/manifests/rocksdb b/build/fbcode_builder/manifests/rocksdb
index e1e3e717318..c560663789d 100644
--- a/build/fbcode_builder/manifests/rocksdb
+++ b/build/fbcode_builder/manifests/rocksdb
@@ -2,8 +2,8 @@
 name = rocksdb
 
 [download]
-url = https://github.com/facebook/rocksdb/archive/refs/tags/v7.7.3.tar.gz
-sha256 = b8ac9784a342b2e314c821f6d701148912215666ac5e9bdbccd93cf3767cb611
+url = https://github.com/facebook/rocksdb/archive/refs/tags/v8.7.3.zip
+sha256 = 36c06b61dc167f2455990d60dd88d734b73aa8c4dfc095243efd0243834c6cd3
 
 [dependencies]
 lz4
@@ -11,7 +11,7 @@ snappy
 
 [build]
 builder = cmake
-subdir = rocksdb-7.7.3
+subdir = rocksdb-8.7.3
 
 [cmake.defines]
 WITH_SNAPPY=ON
@@ -22,10 +22,6 @@ WITH_BENCHMARK_TOOLS=OFF
 # and there's no clear way to make it pick the shared gflags
 # so just turn it off.
 WITH_GFLAGS=OFF
-# mac pro machines don't have some of the newer features that
-# rocksdb enables by default; ask it to disable their use even
-# when building on new hardware
-PORTABLE = ON
 # Disable the use of -Werror
 FAIL_ON_WARNINGS = OFF