diff --git a/build-bench-env.sh b/build-bench-env.sh index 31f05de8..327badf7 100755 --- a/build-bench-env.sh +++ b/build-bench-env.sh @@ -763,6 +763,9 @@ if test "$setup_rocksdb" = "1"; then fi cd "rocksdb-$version_rocksdb" + set +e + patch -p1 -N -r- < ../../patches/rocksdb_build.patch > /dev/null + set -e DISABLE_WARNING_AS_ERROR=1 DISABLE_JEMALLOC=1 ROCKSDB_DISABLE_TCMALLOC=1 make db_bench -j $procs [ "$CI" ] && find . -name '*.o' -delete popd diff --git a/patches/rocksdb_build.patch b/patches/rocksdb_build.patch new file mode 100644 index 00000000..4002f7c8 --- /dev/null +++ b/patches/rocksdb_build.patch @@ -0,0 +1,28 @@ +# backported from https://github.com/facebook/rocksdb/commit/a4f2d46ab6065eb43ee781b0d57c29787780d935 +diff --git a/db/blob/blob_file_meta.h b/db/blob/blob_file_meta.h +index d7c8a124336..2e47726f8d1 100644 +--- a/db/blob/blob_file_meta.h ++++ b/db/blob/blob_file_meta.h +@@ -6,6 +6,7 @@ + #pragma once + + #include ++#include + #include + #include + #include + +# backported from https://github.com/facebook/rocksdb/commit/e812a3d3b32ac159f2df99bcae4ca55173e790d5 +diff --git a/include/rocksdb/trace_record.h b/include/rocksdb/trace_record.h +index 8f9c3ee2f0f..d0f1532aa3a 100644 +--- a/include/rocksdb/trace_record.h ++++ b/include/rocksdb/trace_record.h +@@ -8,7 +8,7 @@ + #include + #include + #include +- ++#include + #include "rocksdb/rocksdb_namespace.h" + #include "rocksdb/slice.h" + #include "rocksdb/status.h"