status-im
/
nim-rocksdb
mirror of https://github.com/status-im/nim-rocksdb.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bump RocksDb to v9.2.1 (#69) 

* Bump RocksDb dependencies to v9.2.1

* Debug dlOpen.

* Static link dependencies.
This commit is contained in:
web3-developer 2024-08-15 22:08:21 +08:00 committed by GitHub
parent 965029e395
commit 2ae39ceb66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rocksdb.nimble
View File

@ -22,7 +22,7 @@ task clean, "Remove temporary files":
exec "make -C vendor/rocksdb clean" exec "make -C vendor/rocksdb clean"
task test, "Run tests": task test, "Run tests":
let runTests = "nim c -r --threads:on tests/test_all.nim" let runTests = "nim c -d:nimDebugDlOpen -r --threads:on tests/test_all.nim"
when defined(linux): when defined(linux):
exec "export LD_LIBRARY_PATH=build; " & runTests exec "export LD_LIBRARY_PATH=build; " & runTests
when defined(macosx): when defined(macosx):

2
scripts/build_shared_deps_linux.sh
View File

@ -25,6 +25,4 @@ ${REPO_DIR}/vendor/vcpkg/vcpkg install rocksdb[lz4,zstd]:x64-linux-rocksdb --rec
mkdir -p "${BUILD_DEST}" mkdir -p "${BUILD_DEST}"
cp "${REPO_DIR}/vendor/vcpkg/installed/x64-linux-rocksdb/lib/liblz4.so" "${BUILD_DEST}/"
cp "${REPO_DIR}/vendor/vcpkg/installed/x64-linux-rocksdb/lib/libzstd.so" "${BUILD_DEST}/"
cp "${REPO_DIR}/vendor/vcpkg/installed/x64-linux-rocksdb/lib/librocksdb.so" "${BUILD_DEST}/" cp "${REPO_DIR}/vendor/vcpkg/installed/x64-linux-rocksdb/lib/librocksdb.so" "${BUILD_DEST}/"

2
scripts/build_shared_deps_osx.sh
View File

@ -25,6 +25,4 @@ ${REPO_DIR}/vendor/vcpkg/vcpkg install rocksdb[lz4,zstd]:x64-osx-rocksdb --recur
mkdir -p "${BUILD_DEST}" mkdir -p "${BUILD_DEST}"
cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/liblz4.dylib" "${BUILD_DEST}/"
cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/libzstd.dylib" "${BUILD_DEST}/"
cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/librocksdb.dylib" "${BUILD_DEST}/" cp "${REPO_DIR}/vendor/vcpkg/installed/x64-osx-rocksdb/lib/librocksdb.dylib" "${BUILD_DEST}/"

11
triplets/x64-linux-rocksdb.cmake
View File

@ -1,7 +1,12 @@
set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_BUILD_TYPE release) set(VCPKG_BUILD_TYPE release)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME Linux) set(VCPKG_CMAKE_SYSTEM_NAME Linux)
set(VCPKG_FIXUP_ELF_RPATH ON) set(VCPKG_FIXUP_ELF_RPATH ON)
if(${PORT} MATCHES "snappy|zlib|lz4|zstd")
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)
else()
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()

11
triplets/x64-osx-rocksdb.cmake
View File

@ -1,7 +1,12 @@
set(VCPKG_TARGET_ARCHITECTURE x64) set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_BUILD_TYPE release) set(VCPKG_BUILD_TYPE release)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_CMAKE_SYSTEM_NAME Darwin) set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
set(VCPKG_OSX_ARCHITECTURES x86_64) set(VCPKG_OSX_ARCHITECTURES x86_64)
if(${PORT} MATCHES "snappy|zlib|lz4|zstd")
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)
else()
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()

2
vendor/rocksdb vendored

@ -1 +1 @@
Subproject commit bcf88d48ce8aa8b536aee4dd305533b3b83cf435 Subproject commit 08f93221f50700f19f11555fb46abfe708a716d1

2
vendor/vcpkg vendored

@ -1 +1 @@
Subproject commit 01f602195983451bc83e72f4214af2cbc495aa94 Subproject commit 1de2026f28ead93ff1773e6e680387643e914ea1