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

Regenerate with boost 1.73.0 minimum version. #1372

Merged
merged 1 commit into from
Sep 1, 2023
Merged

Regenerate with boost 1.73.0 minimum version. #1372

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Installation of libbitcoin-system comes with requirements listed below.

Use of `install-cmake.sh` additionally requires [cmake](https://cmake.org) 3.5+.

A minimal libbitcoin-system build requires boost 1.72.0 to 1.76.0 and libsecp256k1. The [libbitcoin/secp256k1](https://github.com/libbitcoin/secp256k1/tree/version7) repository is forked from [bitcoin-core/secp256k1](https://github.com/bitcoin-core/secp256k1) in order to control for changes and to incorporate the necessary Visual Studio build. The original repository can be used directly but recent changes to the public interface may cause build breaks. The `--enable-module-recovery` switch is required. Both of these are able to be provided via the installation script(s).
A minimal libbitcoin-system build requires boost 1.73.0 to 1.76.0 and libsecp256k1. The [libbitcoin/secp256k1](https://github.com/libbitcoin/secp256k1/tree/version7) repository is forked from [bitcoin-core/secp256k1](https://github.com/bitcoin-core/secp256k1) in order to control for changes and to incorporate the necessary Visual Studio build. The original repository can be used directly but recent changes to the public interface may cause build breaks. The `--enable-module-recovery` switch is required. Both of these are able to be provided via the installation script(s).

Detailed instructions are provided below.

Expand Down Expand Up @@ -93,7 +93,7 @@ $ sudo apt install build-essential autoconf automake libtool pkg-config git

#### Boost (Not Recommended)

Next install the [Boost](http://www.boost.org) (1.72.0 - 1.76.0) development package. This can be accomplished via parameterization of the installation script during libbitcoin-system installation and it is recommended to the reader that this approach be used.
Next install the [Boost](http://www.boost.org) (1.73.0 - 1.76.0) development package. This can be accomplished via parameterization of the installation script during libbitcoin-system installation and it is recommended to the reader that this approach be used.

Due to the current state of packaging, boost is not provided by the standard packaging system at the required minimum version. This requires either manual source compilation (as is controlled within the installation scripts) or trusting a 3rd party [Personal Package Archive](https://launchpad.net/ubuntu/+ppas). Verification of the build is done against the sources (required for proper use of ICU).

Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ endif()

# Find boost
#------------------------------------------------------------------------------
find_package( Boost 1.72.0 REQUIRED COMPONENTS
find_package( Boost 1.73.0 REQUIRED COMPONENTS
atomic
chrono
date_time
Expand Down
52 changes: 26 additions & 26 deletions builds/msvc/vs2022/libbitcoin-system-examples/libbitcoin-system-examples.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,38 +84,38 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets')" />
<Import Project="$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets')" />
<Import Project="$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.72.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc141.1.72.0.0\build\boost_atomic-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc141.1.72.0.0\build\boost_chrono-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc141.1.72.0.0\build\boost_date_time-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc141.1.72.0.0\build\boost_filesystem-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc141.1.72.0.0\build\boost_iostreams-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc141.1.72.0.0\build\boost_locale-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc141.1.72.0.0\build\boost_log_setup-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc141.1.72.0.0\build\boost_log-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc141.1.72.0.0\build\boost_program_options-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc141.1.72.0.0\build\boost_regex-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc141.1.72.0.0\build\boost_system-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc141.1.72.0.0\build\boost_thread-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.73.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_atomic-vc141.1.73.0.0\build\boost_atomic-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc141.1.73.0.0\build\boost_chrono-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_date_time-vc141.1.73.0.0\build\boost_date_time-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_filesystem-vc141.1.73.0.0\build\boost_filesystem-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc141.1.73.0.0\build\boost_iostreams-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc141.1.73.0.0\build\boost_locale-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log_setup-vc141.1.73.0.0\build\boost_log_setup-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_log-vc141.1.73.0.0\build\boost_log-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc141.1.73.0.0\build\boost_program_options-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc141.1.73.0.0\build\boost_regex-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc141.1.73.0.0\build\boost_system-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc141.1.73.0.0\build\boost_thread-vc141.targets'))" />
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc141.0.1.0.19\build\native\secp256k1_vc141.targets'))" />
</Target>
<ItemGroup>
Expand Down
26 changes: 13 additions & 13 deletions builds/msvc/vs2022/libbitcoin-system-examples/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@
|
-->
<packages>
<package id="boost" version="1.72.0.0" targetFramework="Native" />
<package id="boost_atomic-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_chrono-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_date_time-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_filesystem-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_iostreams-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_locale-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_log_setup-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_log-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_program_options-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_regex-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_system-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost_thread-vc141" version="1.72.0.0" targetFramework="Native" />
<package id="boost" version="1.73.0.0" targetFramework="Native" />
<package id="boost_atomic-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_chrono-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_date_time-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_filesystem-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_iostreams-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_locale-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_log_setup-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_log-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_program_options-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_regex-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_system-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="boost_thread-vc141" version="1.73.0.0" targetFramework="Native" />
<package id="secp256k1_vc141" version="0.1.0.19" targetFramework="Native" />
</packages>
Loading