From 90cf2b71c726aef9a1ca3aff98706c5bd3a25ec7 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Thu, 31 Aug 2023 19:52:02 -0700 Subject: [PATCH] Regenerate with boost 1.73.0 minimum version. --- README.md | 4 +- builds/cmake/CMakeLists.txt | 2 +- .../libbitcoin-blockchain-test.vcxproj | 56 +++++++++---------- .../packages.config | 28 +++++----- .../libbitcoin-blockchain-tools.vcxproj | 52 ++++++++--------- .../packages.config | 26 ++++----- .../libbitcoin-blockchain.vcxproj | 52 ++++++++--------- .../libbitcoin-blockchain/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 0e0143d0..16cc365b 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Installation of libbitcoin-blockchain comes with requirements listed below. Use of `install-cmake.sh` additionally requires [cmake](https://cmake.org) 3.5+. -A minimal libbitcoin-blockchain 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-blockchain 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. @@ -91,7 +91,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-blockchain 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-blockchain 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 610fc45f..505717d3 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -157,7 +157,7 @@ endif() # Find boost #------------------------------------------------------------------------------ -find_package( Boost 1.72.0 REQUIRED COMPONENTS +find_package( Boost 1.73.0 REQUIRED COMPONENTS unit_test_framework ) set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" ) diff --git a/builds/msvc/vs2022/libbitcoin-blockchain-test/libbitcoin-blockchain-test.vcxproj b/builds/msvc/vs2022/libbitcoin-blockchain-test/libbitcoin-blockchain-test.vcxproj index d19dcf2f..8de6aa57 100644 --- a/builds/msvc/vs2022/libbitcoin-blockchain-test/libbitcoin-blockchain-test.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-blockchain-test/libbitcoin-blockchain-test.vcxproj @@ -86,41 +86,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-blockchain-test/packages.config b/builds/msvc/vs2022/libbitcoin-blockchain-test/packages.config index 4701b45f..9df8fc07 100644 --- a/builds/msvc/vs2022/libbitcoin-blockchain-test/packages.config +++ b/builds/msvc/vs2022/libbitcoin-blockchain-test/packages.config @@ -6,19 +6,19 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2022/libbitcoin-blockchain-tools/libbitcoin-blockchain-tools.vcxproj b/builds/msvc/vs2022/libbitcoin-blockchain-tools/libbitcoin-blockchain-tools.vcxproj index e991f2d9..f43e3e47 100644 --- a/builds/msvc/vs2022/libbitcoin-blockchain-tools/libbitcoin-blockchain-tools.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-blockchain-tools/libbitcoin-blockchain-tools.vcxproj @@ -78,38 +78,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-blockchain-tools/packages.config b/builds/msvc/vs2022/libbitcoin-blockchain-tools/packages.config index c6369837..5e0011cd 100644 --- a/builds/msvc/vs2022/libbitcoin-blockchain-tools/packages.config +++ b/builds/msvc/vs2022/libbitcoin-blockchain-tools/packages.config @@ -6,18 +6,18 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2022/libbitcoin-blockchain/libbitcoin-blockchain.vcxproj b/builds/msvc/vs2022/libbitcoin-blockchain/libbitcoin-blockchain.vcxproj index 87eb1730..9850acf4 100644 --- a/builds/msvc/vs2022/libbitcoin-blockchain/libbitcoin-blockchain.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-blockchain/libbitcoin-blockchain.vcxproj @@ -119,38 +119,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-blockchain/packages.config b/builds/msvc/vs2022/libbitcoin-blockchain/packages.config index c6369837..5e0011cd 100644 --- a/builds/msvc/vs2022/libbitcoin-blockchain/packages.config +++ b/builds/msvc/vs2022/libbitcoin-blockchain/packages.config @@ -6,18 +6,18 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/configure.ac b/configure.ac index f03f6f00..f4ba720b 100644 --- a/configure.ac +++ b/configure.ac @@ -245,17 +245,17 @@ AS_CASE([${CC}], [*], # 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 1afdf926..aecf8a7a 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -66,8 +66,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 657732b8..0406e915 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -72,8 +72,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 97c48dbd..8490c9f2 100755 --- a/install.sh +++ b/install.sh @@ -66,8 +66,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.