diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000000..378eac25d3 --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +build diff --git a/CMakeLists.txt b/CMakeLists.txt index e37430b2c4..03484ecb0f 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 649617f732..3c73a4d996 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 9e0dcb152d..701c63f43b 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 c54df0b3ca..8dd43866eb 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 8251b56e3c..e34dde1c30 100644 --- a/build.bat +++ b/build.bat @@ -122,7 +122,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 f07e95a865..c659efe978 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() {