From 619a67b3b79660a4c5c6ba265ddf807562132fc6 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sun, 1 Oct 2023 07:53:59 -0700 Subject: [PATCH] drop boost/system stub library (#722) --- .dockerignore | 1 + CMakeLists.txt | 2 +- Dockerfile | 1 - action-install-linux.sh | 1 - build-clang.bat | 1 - build.bat | 1 - install-boost.sh | 2 +- 7 files changed, 3 insertions(+), 6 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 000000000..378eac25d --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +build diff --git a/CMakeLists.txt b/CMakeLists.txt index e37430b2c..03484ecb0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,7 +59,7 @@ if(MSVC) set(Boost_USE_STATIC_RUNTIME ON) endif() -set(BOOST_COMPONENTS filesystem regex system) +set(BOOST_COMPONENTS filesystem regex) if(BOOST_USE_SIGNALS2) set(RIME_BOOST_SIGNALS2 1) diff --git a/Dockerfile b/Dockerfile index 649617f73..3c73a4d99 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,6 @@ RUN apt update && apt install -y \ libboost-dev \ libboost-filesystem-dev \ libboost-regex-dev \ - libboost-system-dev \ libboost-locale-dev \ libgoogle-glog-dev \ libgtest-dev \ diff --git a/action-install-linux.sh b/action-install-linux.sh index 9e0dcb152..701c63f43 100755 --- a/action-install-linux.sh +++ b/action-install-linux.sh @@ -5,7 +5,6 @@ dep_packages=( libboost-filesystem-dev libboost-locale-dev libboost-regex-dev - libboost-system-dev libgoogle-glog-dev libleveldb-dev libmarisa-dev diff --git a/build-clang.bat b/build-clang.bat index c54df0b3c..8dd43866e 100644 --- a/build-clang.bat +++ b/build-clang.bat @@ -59,7 +59,6 @@ if %build_boost% == 1 ( stage^ --with-locale^ --with-filesystem^ - --with-system^ --with-regex || exit popd ) diff --git a/build.bat b/build.bat index 53e3c163e..23824954f 100644 --- a/build.bat +++ b/build.bat @@ -120,7 +120,6 @@ set boost_compiled_libs=--with-date_time^ --with-filesystem^ --with-locale^ --with-regex^ - --with-system^ --with-thread rem the number actually means platform toolset, not %VisualStudioVersion% diff --git a/install-boost.sh b/install-boost.sh index f07e95a86..c659efe97 100755 --- a/install-boost.sh +++ b/install-boost.sh @@ -23,7 +23,7 @@ download_boost_source() { [[ -f "${BOOST_ROOT}/bootstrap.sh" ]] } -boost_libs="${boost_libs=filesystem,regex,system}" +boost_libs="${boost_libs=filesystem,regex}" boost_cxxflags='-arch arm64 -arch x86_64' build_boost_macos() {