From e6f00fd578d3f4405819da2117c26c0bf9efcbf9 Mon Sep 17 00:00:00 2001 From: Jack Robison Date: Mon, 28 Mar 2022 10:20:41 -0400 Subject: [PATCH] move submodule to lbryio fork, update zlib due to 1.2.11 becoming unavailable --- .gitmodules | 2 +- Makefile | 4 ++-- setup.py | 2 +- src/rocksdb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index b1f3b48..fb887ba 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "src/rocksdb"] path = src/rocksdb - url = https://github.com/facebook/rocksdb + url = https://github.com/lbryio/rocksdb diff --git a/Makefile b/Makefile index e898854..edd4ea8 100644 --- a/Makefile +++ b/Makefile @@ -32,8 +32,8 @@ src/rocksdb/librocksdb.a: -Dlz4_LIBRARIES=../lz4-1.9.3/lib \ -Dzstd_INCLUDE_DIRS=../zstd-1.4.9/lib \ -Dzstd_LIBRARIES=../zstd-1.4.9/lib \ - -DZLIB_INCLUDE_DIR=../zlib-1.2.11 \ - -DZLIB_LIBRARY=./zlib-1.2.11 \ + -DZLIB_INCLUDE_DIR=../zlib-1.2.12 \ + -DZLIB_LIBRARY=./zlib-1.2.12 \ -DCMAKE_CXX_FLAGS="-fPIC -I../snappy-1.1.8/build -I../zstd-1.4.9/lib/dictBuilder" \ .. && make -j $(JOBS)) diff --git a/setup.py b/setup.py index 177efc3..908490d 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ if all(map(os.path.exists, STATIC_LIBRARIES)): INCLUDE_DIRS = [ os.path.join("src", "rocksdb", "bzip2-1.0.8"), os.path.join("src", "rocksdb", "zstd-1.4.9", "lib"), - os.path.join("src", "rocksdb", "zlib-1.2.11"), + os.path.join("src", "rocksdb", "zlib-1.2.12"), os.path.join("src", "rocksdb", "snappy-1.1.8"), os.path.join("src", "rocksdb", "snappy-1.1.8", "build"), os.path.join("src", "rocksdb", "lz4-1.9.3", "lib"), diff --git a/src/rocksdb b/src/rocksdb index 0103296..752fea5 160000 --- a/src/rocksdb +++ b/src/rocksdb @@ -1 +1 @@ -Subproject commit 0103296f39ec3fd89b4cdda9687c63fde90eec24 +Subproject commit 752fea5d4400198bc8a591b7d795d1c8d5f12230