move submodule to lbryio fork, update zlib due to 1.2.11 becoming una…

…vailable
labteral · Mar 28, 2022 · e6f00fd · e6f00fd
1 parent 69252c0
commit e6f00fd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -59,7 +59,7 @@ def cythonize(extensions):
     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