diff --git a/build.py b/build.py index c9b682b914..759f701d76 100755 --- a/build.py +++ b/build.py @@ -958,6 +958,7 @@ def create_dockerfile_buildbase_rhel(ddir, dockerfile_name, argmap): gperf \\ re2-devel \\ openssl-devel \\ + libboost-dev=1.83.* \\ libtool \\ libcurl-devel \\ libb64-devel \\ @@ -992,13 +993,6 @@ def create_dockerfile_buildbase_rhel(ddir, dockerfile_name, argmap): virtualenv \\ patchelf==0.17.2 -# Install boost version >= 1.78 for boost::span -# Current libboost-dev apt packages are < 1.78, so install from tar.gz -RUN wget -O /tmp/boost.tar.gz \\ - https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz \\ - && (cd /tmp && tar xzf boost.tar.gz) \\ - && mv /tmp/boost_1_80_0/boost /usr/include/boost - # Server build requires recent version of CMake (FetchContent required) # Might not need this if the installed version of cmake is high enough for our build. # RUN apt update -q=2 \\ @@ -1083,6 +1077,7 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap): build-essential \\ git \\ gperf \\ + libboost-dev=1.83.* \\ libre2-dev \\ libssl-dev \\ libtool \\ @@ -1112,13 +1107,6 @@ def create_dockerfile_buildbase(ddir, dockerfile_name, argmap): virtualenv \\ patchelf==0.17.2 -# Install boost version >= 1.78 for boost::span -# Current libboost-dev apt packages are < 1.78, so install from tar.gz -RUN wget -O /tmp/boost.tar.gz \\ - https://archives.boost.io/release/1.80.0/source/boost_1_80_0.tar.gz \\ - && (cd /tmp && tar xzf boost.tar.gz) \\ - && mv /tmp/boost_1_80_0/boost /usr/include/boost - # Server build requires recent version of CMake (FetchContent required) RUN apt update -q=2 \\ && apt install -y gpg wget \\