Skip to content
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

build(core): Update Boost to v1.87.0 in order to pull in boost::urls; Replace calls to boost::asio's deprecated expires_from_now with expires_after. #636

Merged
merged 5 commits into from
Dec 16, 2024
Merged

build(core): Update Boost to v1.87.0 in order to pull in boost::urls; Replace calls to boost::asio's deprecated expires_from_now with expires_after. #636

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
989b335
Upgrade Boost to 1.81.0 to pull in Boost::urls
gibber9809 Dec 13, 2024
657e5f0
Install boost 1.87.0 whenever we build and install boost ourselves
gibber9809 Dec 16, 2024
b38db17
Install boost 1.86.0 because some boost components we use are depreca…
gibber9809 Dec 16, 2024
c8b564c
Switch from expires_from_now to expires_after
gibber9809 Dec 16, 2024
b7a147a
Switch back to 1.87.0 again
gibber9809 Dec 16, 2024
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
2 changes: 1 addition & 1 deletion components/core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ endif()
if(CLP_USE_STATIC_LIBS)
set(Boost_USE_STATIC_LIBS ON)
endif()
find_package(Boost 1.74 REQUIRED iostreams program_options filesystem system regex)
find_package(Boost 1.81 REQUIRED iostreams program_options filesystem system regex url)
if(Boost_FOUND)
message(STATUS "Found Boost ${Boost_VERSION}")
else()
Expand Down
2 changes: 1 addition & 1 deletion components/core/tools/scripts/lib_install/centos-stream-9/install-packages-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
lib_install_scripts_dir="${script_dir}/.."

# NOTE: The remaining installation scripts depend on boost, so we install it beforehand.
"${lib_install_scripts_dir}/install-boost.sh" 1.76.0
"${lib_install_scripts_dir}/install-boost.sh" 1.81.0

"${lib_install_scripts_dir}/fmtlib.sh" 8.0.1
"${lib_install_scripts_dir}/spdlog.sh" 1.9.2
Expand Down
2 changes: 1 addition & 1 deletion components/core/tools/scripts/lib_install/install-boost.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tar xzf ${tar_filename}
cd boost_${version_with_underscores}

# Build
./bootstrap.sh --with-libraries=filesystem,iostreams,program_options,regex,system
./bootstrap.sh --with-libraries=filesystem,iostreams,program_options,regex,system,url
./b2 -j${num_cpus}

# Install
Expand Down
2 changes: 1 addition & 1 deletion components/core/tools/scripts/lib_install/ubuntu-focal/install-packages-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
lib_install_scripts_dir=$script_dir/..

# NOTE: boost must be installed first since the remaining packages depend on it
"$lib_install_scripts_dir"/install-boost.sh 1.74.0
"$lib_install_scripts_dir"/install-boost.sh 1.81.0

"$lib_install_scripts_dir"/fmtlib.sh 8.0.1
"$lib_install_scripts_dir"/libarchive.sh 3.5.1
Expand Down
3 changes: 3 additions & 0 deletions components/core/tools/scripts/lib_install/ubuntu-jammy/install-packages-from-source.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ set -u
script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
lib_install_scripts_dir=$script_dir/..

# NOTE: boost must be installed first since the remaining packages depend on it
"$lib_install_scripts_dir"/install-boost.sh 1.81.0

"$lib_install_scripts_dir"/fmtlib.sh 8.0.1
"$lib_install_scripts_dir"/libarchive.sh 3.5.1
"$lib_install_scripts_dir"/lz4.sh 1.8.2
Expand Down
3 changes: 0 additions & 3 deletions components/core/tools/scripts/lib_install/ubuntu-jammy/install-prebuilt-packages.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
build-essential \
git \
jq \
libboost-filesystem-dev \
libboost-iostreams-dev \
libboost-program-options-dev \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Chose to switch to the boost install script on jammy because libboost-url-dev is only available from ubuntu noble onwards.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about the MacOS install scripts?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use the brew install formula for boost, which appears to be on 1.86 right now, so it satisfies the requirement.

https://formulae.brew.sh/formula/boost

libcurl4 \
libcurl4-openssl-dev \
libmariadb-dev \
Expand Down
Loading