1

apache · Sep 25, 2024 · 28ebcfa · 28ebcfa
1 parent 5e2401b
commit 28ebcfa
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 7 deletions.
diff --git a/build_tools/pack_client.sh b/build_tools/pack_client.sh
@@ -103,10 +103,6 @@ mkdir -p ${pack}/lib
 copy_file ${BUILD_LATEST_DIR}/output/lib/libpegasus_client_static.a ${pack}/lib
 # TODO(yingchun): make sure shared lib works well too
 # copy_file ${BUILD_LATEST_DIR}/output/lib/libpegasus_client_shared.so ${pack}/lib
-copy_file ${THIRDPARTY_ROOT}/output/lib/libboost*.so.1.86.0 ${pack}/lib
-ln -sf `ls ${pack}/lib | grep libboost_system` ${pack}/lib/libboost_system.so
-ln -sf `ls ${pack}/lib | grep libboost_filesystem` ${pack}/lib/libboost_filesystem.so
-ln -sf `ls ${pack}/lib | grep libboost_regex` ${pack}/lib/libboost_regex.so
 
 cp -v -r ./src/include ${pack}
 

diff --git a/build_tools/pack_server.sh b/build_tools/pack_server.sh
@@ -127,7 +127,6 @@ else
     copy_file ${THIRDPARTY_ROOT}/output/lib/libtcmalloc_and_profiler.so.4 ${pack}/bin
 fi
 
-copy_file ${THIRDPARTY_ROOT}/output/lib/libboost*.so.1.86.0 ${pack}/bin
 copy_file ${THIRDPARTY_ROOT}/output/lib/libhdfs* ${pack}/bin
 copy_file ${THIRDPARTY_ROOT}/output/lib/librocksdb.so.8 ${pack}/bin
 copy_file ./admin_tools/config_hdfs.sh ${pack}/bin

diff --git a/build_tools/pack_tools.sh b/build_tools/pack_tools.sh
@@ -141,7 +141,6 @@ else
     copy_file ${THIRDPARTY_ROOT}/output/lib/libtcmalloc_and_profiler.so.4 ${pack}/lib/
 fi
 
-copy_file ${THIRDPARTY_ROOT}/output/lib/libboost*.so.1.86.0 ${pack}/lib/
 copy_file ${THIRDPARTY_ROOT}/output/lib/libhdfs* ${pack}/lib/
 copy_file ${THIRDPARTY_ROOT}/output/lib/librocksdb.so.8 ${pack}/lib/
 copy_file `get_stdcpp_lib $custom_gcc $separate_servers` ${pack}/lib/

diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt
@@ -61,7 +61,7 @@ ExternalProject_Add(boost
         URL https://github.com/boostorg/boost/releases/download/boost-1.86.0/boost-1.86.0-b2-nodocs.tar.gz
         URL_MD5 30a657150d8e5cf431e1de4396a433d0
         CONFIGURE_COMMAND ./bootstrap.sh --prefix=. --with-libraries=filesystem,system --with-toolset=gcc
-        BUILD_COMMAND ./b2 toolset=gcc cxxflags=-fPIC cxxflags=--std=c++17 install
+        BUILD_COMMAND ./b2 toolset=gcc link=static cxxflags=-fPIC cxxflags=--std=c++17 install
         INSTALL_COMMAND cp -R include/boost ${TP_OUTPUT}/include && cp -R lib ${TP_OUTPUT}/
         BUILD_IN_SOURCE 1
         DOWNLOAD_EXTRACT_TIMESTAMP true