Skip to content

Updates Conan dependencies: Boost #5264

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

Jump to bottom
Merged
merged 34 commits into from
Jul 25, 2025
Merged

Updates Conan dependencies: Boost #5264

merged 34 commits into from
Jul 25, 2025

Conversation

bthomee
Copy link
Collaborator

@bthomee bthomee commented Jan 30, 2025

High Level Overview of Change

This PR updates Boost to version 1.86.0. Only minor changes were necessary to the code.

Context of Change

Dependency scanning revealed that current dependencies are out of date. Updating dependencies allows us to take advantage of bug fixes, new features, and/or security improvements.

Type of Change

  • Refactor (non-breaking change that only restructures code)

@bthomee bthomee marked this pull request as draft January 30, 2025 14:03
Base automatically changed from bthomee/deps to develop February 6, 2025 21:16
@bthomee bthomee changed the title Updates Conan dependencies Updates Conan dependencies: Boost Mar 6, 2025
@codecov Codecov
Copy link

codecov bot commented Mar 26, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (develop@e7a7bb8). Learn more about missing BASE report.
⚠️ Report is 1 commits behind head on develop.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##             develop   #5264   +/-   ##
=========================================
  Coverage           ?   78.8%           
=========================================
  Files              ?     814           
  Lines              ?   71259           
  Branches           ?    8342           
=========================================
  Hits               ?   56162           
  Misses             ?   15097           
  Partials           ?       0
Files with missing lines Coverage Δ
include/xrpl/basics/Log.h 71.4% <ø> (ø)
src/libxrpl/basics/FileUtilities.cpp 71.4% <100.0%> (ø)
src/xrpld/app/main/Application.cpp 69.2% <ø> (ø)
src/xrpld/app/main/Main.cpp 79.0% <ø> (ø)

Impacted file tree graph

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@bthomee bthomee mentioned this pull request Apr 3, 2025
Closed
1 task
@bthomee bthomee added this to the 2.6.0 (Q3 2025) milestone May 27, 2025
@bthomee bthomee marked this pull request as ready for review July 23, 2025 15:13
@bthomee bthomee requested a review from Bronek July 23, 2025 15:13
@bthomee bthomee requested a review from a1q123456 July 23, 2025 15:23
@Bronek
Copy link
Collaborator

Bronek commented Jul 24, 2025 •
edited
Loading

I investigated the link error due to duplicate definition of __cxa_allocate_exception. We have three options to fix it:

  • Do not upgrade to 1.86.0 ; instead upgrade only to 1.84.0 (I recommend against, we will eventually need to upgrade higher than 1.84.0 anyway)

  • Disable the use of boost in soci, with a one-line change in our conanfile.py

diff --git a/conanfile.py b/conanfile.py
index 174d723d95..a98c1b0e8a 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -98,6 +98,7 @@ class Xrpl(ConanFile):
                 self.version = match.group(1)

     def configure(self):
+        self.options["soci"].with_boost = False
         if self.settings.compiler == 'apple-clang':
             self.options['boost'].visibility = 'global'
  • Switch our external/soci to use boost headers only. Incidentally, that's what "official" soci does
diff --git a/external/soci/conanfile.py b/external/soci/conanfile.py
index 0e5257bd7b..fe4c54e53e 100644
--- a/external/soci/conanfile.py
+++ b/external/soci/conanfile.py
@@ -154,7 +154,7 @@ class SociConan(ConanFile):
         self.cpp_info.components["soci_core"].set_property("cmake_target_name", "SOCI::soci_core{}".format(target_suffix))
         self.cpp_info.components["soci_core"].libs = ["{}soci_core{}".format(lib_prefix, lib_suffix)]
         if self.options.with_boost:
-            self.cpp_info.components["soci_core"].requires.append("boost::boost")
+            self.cpp_info.components["soci_core"].requires.append("boost::headers")

         # soci_empty
         if self.options.empty:

I think the last option is probably best.

Bronek added a commit that referenced this pull request Jul 24, 2025
@Bronek
Updates Conan dependencies: Boost #5264
615e380
@Bronek
Copy link
Collaborator

Bronek commented Jul 24, 2025

instrumentation error should be fixed with #5607 , or by cherry-picking 2ea247b

@Bronek Bronek mentioned this pull request Jul 24, 2025
Closed
9 tasks
@bthomee bthomee requested a review from Bronek July 25, 2025 14:01
@bthomee bthomee added the Ready to merge *PR author* thinks it's ready to merge. Has passed code review. Perf sign-off may still be required. label Jul 25, 2025
a1q123456
a1q123456 approved these changes Jul 25, 2025
View reviewed changes
Copy link
Collaborator

@a1q123456 a1q123456 left a comment

Choose a reason for hiding this comment

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

LGTM

@bthomee bthomee merged commit 921aef9 into develop Jul 25, 2025
27 checks passed
@bthomee bthomee deleted the bthomee/deps2 branch July 25, 2025 15:54
ximinez added a commit that referenced this pull request Jul 29, 2025
@ximinez
Merge remote-tracking branch 'XRPLF/ximinez/lending-refactoring-4' in…
6310b25 
…to ximinez/lending-XLS-66

* XRPLF/ximinez/lending-refactoring-4:
  Build options cleanup (#5581)
  Updates Conan dependencies: Boost 1.86 (#5264)
  VaultWithdraw destination account bugfix (#5572)
@godexsoft godexsoft mentioned this pull request Aug 6, 2025
Open
This was referenced Aug 27, 2025
Merged
Merged
@Bronek Bronek mentioned this pull request Sep 3, 2025
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Bronek Bronek Bronek approved these changes

@a1q123456 a1q123456 a1q123456 approved these changes

Assignees

No one assigned

Labels

Ready to merge *PR author* thinks it's ready to merge. Has passed code review. Perf sign-off may still be required.

Projects

None yet

Milestone

2.6.0 (Q3 2025)

Development

Successfully merging this pull request may close these issues.

3 participants

@bthomee @Bronek @a1q123456