dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #4319 from clemahieu/rocksdb_8_6_7

Browse source 
Rocksdb 8.6.7 and Clang 16 upgrade
This commit is contained in:
clemahieu 2023-10-31 12:51:53 +00:00 • committed by GitHub
commit d7f2b8e23e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -491,18 +491,13 @@ set(WITH_TOOLS
CACHE BOOL "" FORCE) CACHE BOOL "" FORCE)
if(ENABLE_AVX2) if(ENABLE_AVX2)
set(PORTABLE set(PORTABLE
OFF 0
CACHE BOOL "" FORCE) CACHE BOOL "" FORCE)
else() else()
set(PORTABLE set(PORTABLE
ON 1
CACHE BOOL "" FORCE) CACHE BOOL "" FORCE)
endif() 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) add_subdirectory(submodules/rocksdb EXCLUDE_FROM_ALL)
include_directories(cpptoml/include) include_directories(cpptoml/include)

18
ci/prepare/linux/prepare-clang.sh
View file

@ -1,17 +1,15 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
apt-get update -qq && apt-get install -yqq \ CLANG_VERSION=16
clang \
lldb
export CXX=/usr/bin/clang++ # TODO: Verify integrity (at this time, the clang build is not used for any production artifacts)
export CC=/usr/bin/clang curl -O https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && ./llvm.sh $CLANG_VERSION
update-alternatives --install /usr/bin/cc cc /usr/bin/clang 100
update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++ 100
# workaround to get a path that can be easily passed into cmake for update-alternatives --install /usr/bin/cc cc /usr/bin/clang-$CLANG_VERSION 100
# BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE update-alternatives --install /usr/bin/c++ c++ /usr/bin/clang++-$CLANG_VERSION 100
# see https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3 update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-$CLANG_VERSION 100
# Workaround to get a path that can be easily passed into cmake for BOOST_STACKTRACE_BACKTRACE_INCLUDE_FILE
# See https://www.boost.org/doc/libs/1_70_0/doc/html/stacktrace/configuration_and_build.html#stacktrace.configuration_and_build.f3
backtrace_file=$(find /usr/lib/gcc/ -name 'backtrace.h' | head -n 1) && test -f $backtrace_file && ln -s $backtrace_file /tmp/backtrace.h backtrace_file=$(find /usr/lib/gcc/ -name 'backtrace.h' | head -n 1) && test -f $backtrace_file && ln -s $backtrace_file /tmp/backtrace.h

2
submodules/rocksdb

@ -1 +1 @@
Subproject commit bf2c335184de16a3cc1787fa97ef9f22f7114238 Subproject commit cb7a5e02edeb883193eb5b4901d5943f58e9add9