MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-01-13 08:23:56 +01:00
Code Issues Releases Wiki Activity

configure: Eliminate condition for shared or static rocksdb.

Browse source
This commit is contained in:
Jason Volk 2020-05-06 20:23:32 -07:00
parent e7ff7e0568
commit 676f9ad532
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
configure.ac
View file

@ -1827,22 +1827,10 @@ AC_HELP_STRING([--with-included-rocksdb[[[=shared]]]], [Use the RocksDB sources
ROCKSDB_CPPFLAGS="-isystem $PWD/deps/rocksdb/include" ROCKSDB_CPPFLAGS="-isystem $PWD/deps/rocksdb/include"
ROCKSDB_LDFLAGS="-L$PWD/deps/rocksdb/" ROCKSDB_LDFLAGS="-L$PWD/deps/rocksdb/"
AC_MSG_CHECKING([whether to use shared RocksDB]) AC_MSG_NOTICE([Shared RocksDB linkage requires running charybdis with an intact build directory])
if [[ $withval = "static" ]]; then ROCKSDB_LDFLAGS+=" -Wl,-rpath=$PWD/deps/rocksdb"
AC_MSG_RESULT([no]) ROCKSDB_LIBS="-lrocksdb"
withval="static" rocksdb_linkage="shared_lib"
rocksdb_linkage="static_lib"
AC_MSG_NOTICE([static RocksDB linkage requires multiple dependencies])
AC_MSG_NOTICE([| You may need at least: bzip2, zlib, snappy, lz4])
ROCKSDB_LIBS="$PWD/deps/rocksdb/librocksdb.a"
else
AC_MSG_RESULT([yes])
withval="shared"
rocksdb_linkage="shared_lib"
AC_MSG_NOTICE([Shared RocksDB linkage requires running charybdis with an intact build directory])
ROCKSDB_LDFLAGS+=" -Wl,-rpath=$PWD/deps/rocksdb"
ROCKSDB_LIBS="-lrocksdb"
fi
bash tools/buildrocks.sh $rocksdb_linkage "$ROCKSDB_VERSION_MIN" bash tools/buildrocks.sh $rocksdb_linkage "$ROCKSDB_VERSION_MIN"
AS_IF([ test $? != 0 ], AS_IF([ test $? != 0 ],