Skip to content

build: Removed workaround to install libboost-dev. Back to apt-get install #8037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

build: Removed workaround to install libboost-dev. Back to apt-get install #8037

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 2 additions & 14 deletions build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \\
Expand Down Expand Up @@ -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 \\
Expand Down Expand Up @@ -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 \\
Expand Down Expand Up @@ -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 \\
Expand Down
Loading