From 7cab5cd3123d966613c6d28d60087c97709e2cd3 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Thu, 31 Aug 2023 19:42:47 -0700 Subject: [PATCH] Regenerate with boost 1.73.0 minimum version. --- README.md | 4 +- builds/cmake/CMakeLists.txt | 2 +- .../libbitcoin-protocol-test.vcxproj | 56 +++++++++---------- .../libbitcoin-protocol-test/packages.config | 28 +++++----- .../libbitcoin-protocol.vcxproj | 52 ++++++++--------- .../libbitcoin-protocol/packages.config | 26 ++++----- configure.ac | 6 +- install-cmake.sh | 4 +- install-cmakepresets.sh | 4 +- install.sh | 4 +- 10 files changed, 93 insertions(+), 93 deletions(-) diff --git a/README.md b/README.md index 0037e95..a6bd310 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Installation of libbitcoin-protocol comes with requirements listed below. Use of `install-cmake.sh` additionally requires [cmake](https://cmake.org) 3.5+. -A minimal libbitcoin-protocol build requires boost 1.72.0 to 1.76.0, libsecp256k1, and [zmq](http://www.zeromq.org) 4.3.4. 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-protocol build requires boost 1.73.0 to 1.76.0, libsecp256k1, and [zmq](http://www.zeromq.org) 4.3.4. 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-protocol 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-protocol 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 206f02f..a96303e 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -145,7 +145,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-protocol-test/libbitcoin-protocol-test.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj index 1cdb023..0beaf2d 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-test.vcxproj @@ -91,43 +91,43 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + - + 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-protocol-test/packages.config b/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config index 8926639..614bcca 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config +++ b/builds/msvc/vs2022/libbitcoin-protocol-test/packages.config @@ -6,20 +6,20 @@ | --> - + - - - - - - - - - - - - + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj b/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj index 7af3ebd..b51b979 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-protocol/libbitcoin-protocol.vcxproj @@ -107,40 +107,40 @@ - + - - - - - - - - - - - - + + + + + + + + + + + + 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-protocol/packages.config b/builds/msvc/vs2022/libbitcoin-protocol/packages.config index 6a0e9d5..4de22f8 100644 --- a/builds/msvc/vs2022/libbitcoin-protocol/packages.config +++ b/builds/msvc/vs2022/libbitcoin-protocol/packages.config @@ -6,19 +6,19 @@ | --> - + - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/configure.ac b/configure.ac index dfa7226..8aff1b0 100644 --- a/configure.ac +++ b/configure.ac @@ -223,17 +223,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 2f55368..af71270 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -69,8 +69,8 @@ ZMQ_ARCHIVE="zeromq-4.3.4.tar.gz" # 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 47bed72..7a2ec23 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -75,8 +75,8 @@ ZMQ_ARCHIVE="zeromq-4.3.4.tar.gz" # 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 3c3f86c..f713bb1 100755 --- a/install.sh +++ b/install.sh @@ -69,8 +69,8 @@ ZMQ_ARCHIVE="zeromq-4.3.4.tar.gz" # 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.