From 118fac56199fcf5ea96d6e86094e518deec7b16f Mon Sep 17 00:00:00 2001 From: Philipp Moritz Date: Tue, 9 May 2017 16:17:20 -0700 Subject: [PATCH] Remove boost dependencies from Ray (#518) * remove boost regex * workaround for boost * fix * do not link against boost any more * rebased on arrow change --- src/numbuf/CMakeLists.txt | 8 ++++---- src/numbuf/thirdparty/build_thirdparty.sh | 2 +- src/numbuf/thirdparty/download_thirdparty.sh | 2 ++ 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/numbuf/CMakeLists.txt b/src/numbuf/CMakeLists.txt index 830b6fa71..0e4ea74bc 100644 --- a/src/numbuf/CMakeLists.txt +++ b/src/numbuf/CMakeLists.txt @@ -65,15 +65,15 @@ if(APPLE) endif(APPLE) if(APPLE) - target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread -lboost_regex -lboost_system -lboost_filesystem) + target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread) else() - target_link_libraries(numbuf -Wl,--whole-archive ${ARROW_LIB} -Wl,--no-whole-archive ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread -lboost_regex -lboost_system -lboost_filesystem) + target_link_libraries(numbuf -Wl,--whole-archive ${ARROW_LIB} -Wl,--no-whole-archive ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread) endif() if(HAS_PLASMA) - target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} plasma_lib common ${FLATBUFFERS_STATIC_LIB} -lpthread -lboost_regex -lboost_system -lboost_filesystem) + target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} plasma_lib common ${FLATBUFFERS_STATIC_LIB} -lpthread) else() - target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread -lboost_regex -lboost_system -lboost_filesystem) + target_link_libraries(numbuf ${ARROW_LIB} ${ARROW_PYTHON_LIB} ${PYTHON_LIBRARIES} -lpthread) endif() install(TARGETS numbuf DESTINATION ${CMAKE_SOURCE_DIR}/numbuf/) diff --git a/src/numbuf/thirdparty/build_thirdparty.sh b/src/numbuf/thirdparty/build_thirdparty.sh index c1249a124..f06158fb7 100755 --- a/src/numbuf/thirdparty/build_thirdparty.sh +++ b/src/numbuf/thirdparty/build_thirdparty.sh @@ -24,5 +24,5 @@ echo "building arrow" cd $TP_DIR/arrow/cpp mkdir -p $TP_DIR/arrow/cpp/build cd $TP_DIR/arrow/cpp/build -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-g -O3 -march=native -mtune=native" -DCMAKE_CXX_FLAGS="-g -O3 -march=native -mtune=native" -DARROW_BUILD_TESTS=OFF -DARROW_PYTHON=on .. +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-g -O3 -march=native -mtune=native" -DCMAKE_CXX_FLAGS="-g -O3 -march=native -mtune=native" -DARROW_BUILD_TESTS=OFF -DARROW_HDFS=OFF -DARROW_PYTHON=on .. make VERBOSE=1 -j$PARALLEL diff --git a/src/numbuf/thirdparty/download_thirdparty.sh b/src/numbuf/thirdparty/download_thirdparty.sh index 183398241..b68479bc9 100755 --- a/src/numbuf/thirdparty/download_thirdparty.sh +++ b/src/numbuf/thirdparty/download_thirdparty.sh @@ -11,4 +11,6 @@ if [ ! -d $TP_DIR/arrow ]; then git clone https://github.com/apache/arrow/ "$TP_DIR/arrow" fi cd $TP_DIR/arrow + git checkout 670612e6fdf699486641ed0d39d22257eb8acdb2 +