From bbe5e5dd7b576bae4a2c5a379509231e4505ee51 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Thu, 31 Aug 2023 19:43:40 -0700 Subject: [PATCH] Regenerate with boost 1.73.0 minimum version. --- README.md | 4 +- builds/cmake/CMakeLists.txt | 2 +- .../libbitcoin-client-examples.vcxproj | 52 ++++++++--------- .../packages.config | 26 ++++----- .../libbitcoin-client-test.vcxproj | 56 +++++++++---------- .../libbitcoin-client-test/packages.config | 28 +++++----- .../libbitcoin-client.vcxproj | 52 ++++++++--------- .../vs2022/libbitcoin-client/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 5e789ce..ab7c4bc 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ Installation of libbitcoin-client comes with requirements listed below. Use of `install-cmake.sh` additionally requires [cmake](https://cmake.org) 3.5+. -A minimal libbitcoin-client 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-client 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-client 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-client 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 1f5991d..02e225b 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -149,7 +149,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-client-examples/libbitcoin-client-examples.vcxproj b/builds/msvc/vs2022/libbitcoin-client-examples/libbitcoin-client-examples.vcxproj index 0f4c39c..559f1f6 100644 --- a/builds/msvc/vs2022/libbitcoin-client-examples/libbitcoin-client-examples.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-client-examples/libbitcoin-client-examples.vcxproj @@ -78,19 +78,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -98,19 +98,19 @@ 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-client-examples/packages.config b/builds/msvc/vs2022/libbitcoin-client-examples/packages.config index 3834ac2..d1fc5d0 100644 --- a/builds/msvc/vs2022/libbitcoin-client-examples/packages.config +++ b/builds/msvc/vs2022/libbitcoin-client-examples/packages.config @@ -6,19 +6,19 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/builds/msvc/vs2022/libbitcoin-client-test/libbitcoin-client-test.vcxproj b/builds/msvc/vs2022/libbitcoin-client-test/libbitcoin-client-test.vcxproj index aff3bab..951e0d2 100644 --- a/builds/msvc/vs2022/libbitcoin-client-test/libbitcoin-client-test.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-client-test/libbitcoin-client-test.vcxproj @@ -79,43 +79,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-client-test/packages.config b/builds/msvc/vs2022/libbitcoin-client-test/packages.config index c5c9563..f77a5fb 100644 --- a/builds/msvc/vs2022/libbitcoin-client-test/packages.config +++ b/builds/msvc/vs2022/libbitcoin-client-test/packages.config @@ -6,20 +6,20 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/builds/msvc/vs2022/libbitcoin-client/libbitcoin-client.vcxproj b/builds/msvc/vs2022/libbitcoin-client/libbitcoin-client.vcxproj index 4c0727b..3cfd4db 100644 --- a/builds/msvc/vs2022/libbitcoin-client/libbitcoin-client.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-client/libbitcoin-client.vcxproj @@ -94,19 +94,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -114,19 +114,19 @@ 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-client/packages.config b/builds/msvc/vs2022/libbitcoin-client/packages.config index 3834ac2..d1fc5d0 100644 --- a/builds/msvc/vs2022/libbitcoin-client/packages.config +++ b/builds/msvc/vs2022/libbitcoin-client/packages.config @@ -6,19 +6,19 @@ | --> - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/configure.ac b/configure.ac index f18bf10..a493fcf 100644 --- a/configure.ac +++ b/configure.ac @@ -234,17 +234,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 fe4763b..542eb6a 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 ae280a2..4599a2b 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 2b975e5..e92dda6 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.