Skip to content

Commit

Permalink
Bump RocksDb to v9.2.1 (#69)
Browse files Browse the repository at this point in the history
* Bump RocksDb dependencies to v9.2.1

* Debug dlOpen.

* Static link dependencies.
  • Loading branch information
bhartnett authored Aug 15, 2024
1 parent 965029e commit 2ae39ce
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 13 deletions.
2 changes: 1 addition & 1 deletion rocksdb.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ task clean, "Remove temporary files":
exec "make -C vendor/rocksdb clean"

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):
exec "export LD_LIBRARY_PATH=build; " & runTests
when defined(macosx):
Expand Down
2 changes: 0 additions & 2 deletions scripts/build_shared_deps_linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,4 @@ ${REPO_DIR}/vendor/vcpkg/vcpkg install rocksdb[lz4,zstd]:x64-linux-rocksdb --rec

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}/"
2 changes: 0 additions & 2 deletions scripts/build_shared_deps_osx.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,4 @@ ${REPO_DIR}/vendor/vcpkg/vcpkg install rocksdb[lz4,zstd]:x64-osx-rocksdb --recur

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}/"
11 changes: 8 additions & 3 deletions triplets/x64-linux-rocksdb.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_BUILD_TYPE release)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Linux)
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 changes: 8 additions & 3 deletions triplets/x64-osx-rocksdb.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_BUILD_TYPE release)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
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 changes: 1 addition & 1 deletion vendor/rocksdb
Submodule rocksdb updated 171 files
2 changes: 1 addition & 1 deletion vendor/vcpkg
Submodule vcpkg updated 2255 files

0 comments on commit 2ae39ce

Please sign in to comment.