LBRYCommunity/lbry-rocksdb
1
0
Fork 0
Code Issues 6 Pull requests 2 Projects Releases Packages Wiki Activity

move submodule to lbryio fork, update zlib due to 1.2.11 becoming unavailable

Browse source
This commit is contained in:
Jack Robison 2022-03-28 10:20:41 -04:00
parent 69252c0ed4
commit e6f00fd578
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -1,3 +1,3 @@
[submodule "src/rocksdb"] [submodule "src/rocksdb"]
path = src/rocksdb path = src/rocksdb
url = https://github.com/facebook/rocksdb url = https://github.com/lbryio/rocksdb

4
Makefile
View file

@ -32,8 +32,8 @@ src/rocksdb/librocksdb.a:
-Dlz4_LIBRARIES=../lz4-1.9.3/lib \ -Dlz4_LIBRARIES=../lz4-1.9.3/lib \
-Dzstd_INCLUDE_DIRS=../zstd-1.4.9/lib \ -Dzstd_INCLUDE_DIRS=../zstd-1.4.9/lib \
-Dzstd_LIBRARIES=../zstd-1.4.9/lib \ -Dzstd_LIBRARIES=../zstd-1.4.9/lib \
-DZLIB_INCLUDE_DIR=../zlib-1.2.11 \ -DZLIB_INCLUDE_DIR=../zlib-1.2.12 \
-DZLIB_LIBRARY=./zlib-1.2.11 \ -DZLIB_LIBRARY=./zlib-1.2.12 \
-DCMAKE_CXX_FLAGS="-fPIC -I../snappy-1.1.8/build -I../zstd-1.4.9/lib/dictBuilder" \ -DCMAKE_CXX_FLAGS="-fPIC -I../snappy-1.1.8/build -I../zstd-1.4.9/lib/dictBuilder" \
.. && make -j $(JOBS)) .. && make -j $(JOBS))

2
setup.py
View file

@ -59,7 +59,7 @@ if all(map(os.path.exists, STATIC_LIBRARIES)):
INCLUDE_DIRS = [ INCLUDE_DIRS = [
os.path.join("src", "rocksdb", "bzip2-1.0.8"), os.path.join("src", "rocksdb", "bzip2-1.0.8"),
os.path.join("src", "rocksdb", "zstd-1.4.9", "lib"), 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"),
os.path.join("src", "rocksdb", "snappy-1.1.8", "build"), os.path.join("src", "rocksdb", "snappy-1.1.8", "build"),
os.path.join("src", "rocksdb", "lz4-1.9.3", "lib"), os.path.join("src", "rocksdb", "lz4-1.9.3", "lib"),

2
src/rocksdb

@ -1 +1 @@
Subproject commit 0103296f39ec3fd89b4cdda9687c63fde90eec24 Subproject commit 752fea5d4400198bc8a591b7d795d1c8d5f12230