From 7e91291a97afd5750548f4c693e7964184cce7b7 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Thu, 31 Aug 2023 19:41:25 -0700 Subject: [PATCH] Regenerate with boost 1.73.0 minimum version. --- README.md | 4 +- builds/cmake/CMakeLists.txt | 2 +- .../libbitcoin-system-examples.vcxproj | 52 ++++++++--------- .../packages.config | 26 ++++----- .../libbitcoin-system-test.vcxproj | 56 +++++++++---------- .../libbitcoin-system-test/packages.config | 28 +++++----- .../libbitcoin-system.vcxproj | 52 ++++++++--------- .../vs2022/libbitcoin-system/packages.config | 26 ++++----- configure.ac | 6 +- install-cmake.sh | 4 +- install-cmakepresets.sh | 4 +- install.sh | 4 +- 12 files changed, 132 insertions(+), 132 deletions(-) diff --git a/README.md b/README.md index 77375e3002..9b1cb9d4a3 100644 --- a/README.md +++ b/README.md @@ -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. @@ -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). diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index c5352099f3..7cb36f2cd5 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -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 diff --git a/builds/msvc/vs2022/libbitcoin-system-examples/libbitcoin-system-examples.vcxproj b/builds/msvc/vs2022/libbitcoin-system-examples/libbitcoin-system-examples.vcxproj index 42d864b37f..3e3199d370 100644 --- a/builds/msvc/vs2022/libbitcoin-system-examples/libbitcoin-system-examples.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-system-examples/libbitcoin-system-examples.vcxproj @@ -84,38 +84,38 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + 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}. - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2022/libbitcoin-system-examples/packages.config b/builds/msvc/vs2022/libbitcoin-system-examples/packages.config index e4466ab7b8..bcf54598b3 100644 --- a/builds/msvc/vs2022/libbitcoin-system-examples/packages.config +++ b/builds/msvc/vs2022/libbitcoin-system-examples/packages.config @@ -6,18 +6,18 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj b/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj index e2e078872d..9a024d0d14 100644 --- a/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-system-test/libbitcoin-system-test.vcxproj @@ -193,41 +193,41 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - + 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}. - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2022/libbitcoin-system-test/packages.config b/builds/msvc/vs2022/libbitcoin-system-test/packages.config index ab01053cef..8f9edee574 100644 --- a/builds/msvc/vs2022/libbitcoin-system-test/packages.config +++ b/builds/msvc/vs2022/libbitcoin-system-test/packages.config @@ -6,19 +6,19 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj b/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj index 427da03a72..4ec93c0fb8 100644 --- a/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-system/libbitcoin-system.vcxproj @@ -480,38 +480,38 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + 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}. - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2022/libbitcoin-system/packages.config b/builds/msvc/vs2022/libbitcoin-system/packages.config index e4466ab7b8..bcf54598b3 100644 --- a/builds/msvc/vs2022/libbitcoin-system/packages.config +++ b/builds/msvc/vs2022/libbitcoin-system/packages.config @@ -6,18 +6,18 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/configure.ac b/configure.ac index e2207aa2bd..32cc864011 100644 --- a/configure.ac +++ b/configure.ac @@ -258,17 +258,17 @@ AS_CASE([${CC}], [*gcc*], # Check dependencies. #============================================================================== -# Require Boost of at least version 1.72.0 and output ${boost_CPPFLAGS/LDFLAGS}. +# Require Boost of at least version 1.73.0 and output ${boost_CPPFLAGS/LDFLAGS}. #------------------------------------------------------------------------------ AS_CASE([${CC}], [*], - [AX_BOOST_BASE([1.72.0], + [AX_BOOST_BASE([1.73.0], [AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}]) AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`]) AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}]) AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}]) AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}]) AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])], - [AC_MSG_ERROR([Boost 1.72.0 or later is required but was not found.])])]) + [AC_MSG_ERROR([Boost 1.73.0 or later is required but was not found.])])]) AS_CASE([${enable_isystem}],[yes], [AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])], diff --git a/install-cmake.sh b/install-cmake.sh index 8a1f0f89ca..dc73882545 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -63,8 +63,8 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.bz2" -BOOST_ARCHIVE="boost_1_72_0.tar.bz2" +BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2" +BOOST_ARCHIVE="boost_1_73_0.tar.bz2" # Define utility functions. diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 1166ce9c13..a50902f02a 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -69,8 +69,8 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.bz2" -BOOST_ARCHIVE="boost_1_72_0.tar.bz2" +BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2" +BOOST_ARCHIVE="boost_1_73_0.tar.bz2" # Define utility functions. diff --git a/install.sh b/install.sh index 20c6f0666e..66ec8c1113 100755 --- a/install.sh +++ b/install.sh @@ -63,8 +63,8 @@ ICU_ARCHIVE="icu4c-55_2-src.tgz" # Boost archive. #------------------------------------------------------------------------------ -BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.72.0/boost_1_72_0.tar.bz2" -BOOST_ARCHIVE="boost_1_72_0.tar.bz2" +BOOST_URL="http://downloads.sourceforge.net/project/boost/boost/1.73.0/boost_1_73_0.tar.bz2" +BOOST_ARCHIVE="boost_1_73_0.tar.bz2" # Define utility functions.