Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed build on dev server #6

Merged
merged 1 commit into from
Sep 6, 2018
Merged

Fixed build on dev server #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion third-party/fbthrift/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_custom_target(
tgt_fbthrift
COMMAND "./build.sh" "-j16" ">" "./_build.log" "2>&1"
COMMAND "./build.sh" "-j2" ">" "./_build.log" "2>&1"
DEPENDS tgt_glog tgt_gflags tgt_folly tgt_wangle tgt_fatal tgt_mstch tgt_zlib tgt_zstd
)

Expand Down
2 changes: 1 addition & 1 deletion third-party/folly/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_custom_target(
tgt_folly
COMMAND "./build.sh" "-j16" ">" "./_build.log" "2>&1"
COMMAND "./build.sh" "-j2" ">" "./_build.log" "2>&1"
DEPENDS tgt_gflags tgt_glog tgt_zlib tgt_zstd
)

Expand Down
1 change: 0 additions & 1 deletion third-party/gflags/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ fi

if (make $@ install); then
cd $CURR_DIR
rm -fr $INSTALL_PATH/lib/cmake
echo
echo ">>> $PROJECT_NAME is built and installed successfully <<<"
echo
Expand Down
2 changes: 1 addition & 1 deletion third-party/proxygen/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_custom_target(
tgt_proxygen
COMMAND "./build.sh" "-j16" ">" "./_build.log" "2>&1"
COMMAND "./build.sh" "-j2" ">" "./_build.log" "2>&1"
DEPENDS tgt_folly tgt_wangle tgt_gflags tgt_glog
)

Expand Down
2 changes: 1 addition & 1 deletion third-party/rocksdb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_custom_target(
tgt_rocksdb
COMMAND "./build.sh" "-j16" ">" "./_build.log" "2>&1"
COMMAND "./build.sh" "-j2" ">" "./_build.log" "2>&1"
DEPENDS tgt_bzip2 tgt_snappy tgt_zlib tgt_zstd
)

Expand Down
12 changes: 10 additions & 2 deletions third-party/rocksdb/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,18 @@ echo

cd $SOURCE_DIR

if (CC=$GCC_ROOT/bin/gcc CPP=$GCC_ROOT/bin/cpp CXX=$GCC_ROOT/bin/g++ PLATFORM=OS_LINUX CCFLAGS="-DROCKSDB_PLATFORM_POSIX -DROCKSDB_SUPPORT_THREAD_LOCAL -DOS_LINUX -fno-builtin-memcmp -DZLIB -DBZIP2 -DSNAPPY -DZSTD -DROCKSDB_MALLOC_USABLE_SIZE -march=native -fPIC -DPIC -Wno-error=shadow -I$INSTALL_PATH/include -I$BOOST_RELEASE/include -I$OPENSSL_RELEASE/include $EXTRA_CXXFLAGS" CXXFLAGS=$CCFLAGS PLATFORM_LDFLAGS="-static-libstdc++ -static-libgcc -L$INSTALL_PATH/lib -L$BOOST_RELEASE/lib -L$OPENSSL_RELEASE/lib $EXTRA_LDFLAGS -lz -lbz2 -lsnappy -lzstd" JAVA_LDFLAGS=$PLATFORM_LDFLAGS INSTALL_PATH=$INSTALL_PATH DEBUG_LEVEL=0 make $@ static_lib); then
if !($CMAKE_ROOT/bin/cmake $CMAKE_FLAGS -DBOOST_ROOT=$TOOLS_ROOT/boost -DOPENSSL_ROOT_DIR=$TOOLS_ROOT/openssl .); then
cd $CURR_DIR
echo
echo "### $PROJECT_NAME failed to install ###"
echo
exit 1
fi

if (PLATFORM=OS_LINUX CCFLAGS="-DROCKSDB_PLATFORM_POSIX -DROCKSDB_SUPPORT_THREAD_LOCAL -DOS_LINUX -fno-builtin-memcmp -DZLIB -DBZIP2 -DSNAPPY -DZSTD -DROCKSDB_MALLOC_USABLE_SIZE -march=native -fPIC -DPIC -Wno-error=shadow -I$INSTALL_PATH/include $EXTRA_CXXFLAGS" CXXFLAGS=$CCFLAGS PLATFORM_LDFLAGS="-static-libstdc++ -static-libgcc -L$INSTALL_PATH/lib $EXTRA_LDFLAGS -lz -lbz2 -lsnappy -lzstd" JAVA_LDFLAGS=$PLATFORM_LDFLAGS DEBUG_LEVEL=0 make $@); then
if [[ $SOURCE_DIR/librocksdb.a -nt $INSTALL_PATH/lib/librocksdb.a ]]; then
echo "===> Ready to install"
if (INSTALL_PATH=$INSTALL_PATH make install-static); then
if (INSTALL_PATH=$INSTALL_PATH make install); then
cd $CURR_DIR
echo
echo ">>> $PROJECT_NAME is built and installed successfully <<<"
Expand Down
2 changes: 1 addition & 1 deletion third-party/wangle/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
add_custom_target(
tgt_wangle
COMMAND "./build.sh" "-j16" ">" "./_build.log" "2>&1"
COMMAND "./build.sh" "-j2" ">" "./_build.log" "2>&1"
DEPENDS tgt_folly tgt_libevent tgt_gflags tgt_glog tgt_double-conversion
)

Expand Down