Skip to content

Conversation

@fanquake
Copy link
Member

@fanquake fanquake commented Mar 5, 2022

Backports #24104 to the 22.x branch to fix the build with Boost 1.78.0.

@fanquake fanquake requested a review from achow101 March 5, 2022 16:17
boost::system::error_code error;
// The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory
fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error);
fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error).remove_trailing_separator();
Copy link
Member

Choose a reason for hiding this comment

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

Why this change is required? I see no broken tests on the current 22.x branch (9b5f674) on macOS 12.2.1 (Apple M1).

Copy link
Member

Choose a reason for hiding this comment

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

On my system with boost 1.78, the unit tests fail with a trailing backslash in the path here.

@achow101
Copy link
Member

achow101 commented Mar 5, 2022

ACK 021c3d8

Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 021c3d8

@gruve-p
Copy link
Contributor

gruve-p commented Mar 6, 2022

ACK 021c3d8

@fanquake fanquake merged commit cb13ba6 into bitcoin:22.x Mar 7, 2022
@fanquake fanquake deleted the 22_x_boost_178 branch March 7, 2022 09:40
@fanquake fanquake added this to the 22.1 milestone Mar 7, 2022
@bitcoin bitcoin locked and limited conversation to collaborators Mar 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants