Skip to content

Commit 23063ac

Browse files
committed
[fix] decoupling librocksdb.a
1 parent 5db6a7a commit 23063ac

1 file changed

Lines changed: 27 additions & 29 deletions

File tree

deps/Makefile

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -164,35 +164,33 @@ ROCKSDB_BUILD_FLAGS=USE_COROUTINES=1 USE_FOLLY=1 $(ROCKSDB_BUILD_FOLLY_FLAGS)
164164
if [ ! -f rocksdb/_build_folly/installed/folly/lib/libfolly.a ]; then \
165165
cd rocksdb && ${ROCKSDB_BUILD_FOLLY_FLAGS} ${MAKE} checkout_folly && ${ROCKSDB_BUILD_FOLLY_FLAGS} ${MAKE} build_folly; \
166166
fi
167-
if [ ! -f ./rocksdb/_build_folly/libs/folly/lib/libfolly.a ]; then \
168-
rm -rf ./rocksdb/_build_folly/libs; \
169-
mkdir -p ./rocksdb/_build_folly/libs; \
170-
FBUILD_PATH=`ls -d ./rocksdb/_build_folly*`; \
171-
BOOST_PATH=`ls -d $${FBUILD_PATH}/installed/boost*`; \
172-
DBL_CONV_PATH=`ls -d $${FBUILD_PATH}/installed/double-conversion*`; \
173-
FMT_PATH=`ls -d $${FBUILD_PATH}/installed/fmt*`; \
174-
GLOG_PATH=`ls -d $${FBUILD_PATH}/installed/glog*`; \
175-
GFLAGS_PATH=`ls -d $${FBUILD_PATH}/installed/gflags*`; \
176-
LIBEVENT_PATH=`ls -d $${FBUILD_PATH}/installed/libevent*`; \
177-
GLOG_LIB_PATH=`ls -d $${GLOG_PATH}/lib*`; \
178-
FMT_LIB_PATH=`ls -d $${FMT_PATH}/lib*`; \
179-
cp -r $${BOOST_PATH} ./rocksdb/_build_folly/libs/boost; \
180-
cp -r $${DBL_CONV_PATH} ./rocksdb/_build_folly/libs/double-conversion; \
181-
mkdir -p ./rocksdb/_build_folly/libs/fmt; \
182-
cp -r $${FMT_PATH}/include ./rocksdb/_build_folly/libs/fmt/include; \
183-
cp -r $${FMT_LIB_PATH} ./rocksdb/_build_folly/libs/fmt/lib; \
184-
mkdir -p ./rocksdb/_build_folly/libs/glog; \
185-
cp -r $${GLOG_PATH}/include ./rocksdb/_build_folly/libs/glog/include; \
186-
cp -r $${GLOG_LIB_PATH} ./rocksdb/_build_folly/libs/glog/lib; \
187-
mkdir -p ./rocksdb/_build_folly/libs/libiberty; \
188-
cp -r $${GFLAGS_PATH} ./rocksdb/_build_folly/libs/gflags; \
189-
cp -r $${LIBEVENT_PATH} ./rocksdb/_build_folly/libs/libevent; \
190-
cp -r $${FBUILD_PATH}/installed/folly ./rocksdb/_build_folly/libs/folly; \
191-
fi
192-
193-
194-
195-
rocksdb: rocksdb/librocksdb.a
167+
rm -rf ./rocksdb/_build_folly/libs
168+
mkdir -p ./rocksdb/_build_folly/libs
169+
FBUILD_PATH=`ls -d ./rocksdb/_build_folly*`; \
170+
BOOST_PATH=`ls -d $${FBUILD_PATH}/installed/boost*`; \
171+
DBL_CONV_PATH=`ls -d $${FBUILD_PATH}/installed/double-conversion*`; \
172+
FMT_PATH=`ls -d $${FBUILD_PATH}/installed/fmt*`; \
173+
GLOG_PATH=`ls -d $${FBUILD_PATH}/installed/glog*`; \
174+
GFLAGS_PATH=`ls -d $${FBUILD_PATH}/installed/gflags*`; \
175+
LIBEVENT_PATH=`ls -d $${FBUILD_PATH}/installed/libevent*`; \
176+
GLOG_LIB_PATH=`ls -d $${GLOG_PATH}/lib*`; \
177+
FMT_LIB_PATH=`ls -d $${FMT_PATH}/lib*`; \
178+
cp -r $${BOOST_PATH} ./rocksdb/_build_folly/libs/boost; \
179+
cp -r $${DBL_CONV_PATH} ./rocksdb/_build_folly/libs/double-conversion; \
180+
mkdir -p ./rocksdb/_build_folly/libs/fmt; \
181+
cp -r $${FMT_PATH}/include ./rocksdb/_build_folly/libs/fmt/include; \
182+
cp -r $${FMT_LIB_PATH} ./rocksdb/_build_folly/libs/fmt/lib; \
183+
mkdir -p ./rocksdb/_build_folly/libs/glog; \
184+
cp -r $${GLOG_PATH}/include ./rocksdb/_build_folly/libs/glog/include; \
185+
cp -r $${GLOG_LIB_PATH} ./rocksdb/_build_folly/libs/glog/lib; \
186+
mkdir -p ./rocksdb/_build_folly/libs/libiberty; \
187+
cp -r $${GFLAGS_PATH} ./rocksdb/_build_folly/libs/gflags; \
188+
cp -r $${LIBEVENT_PATH} ./rocksdb/_build_folly/libs/libevent; \
189+
cp -r $${FBUILD_PATH}/installed/folly ./rocksdb/_build_folly/libs/folly
190+
191+
192+
193+
rocksdb: rocksdb/librocksdb.a ./rocksdb/_build_folly/libs/folly/lib/libfolly.a
196194

197195
rocksdb/librocksdb.a: ./rocksdb/_build_folly/libs/folly/lib/libfolly.a
198196
@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)rocksdb$(ENDCOLOR)

0 commit comments

Comments
 (0)