From eecba4c49e3e9e44d3e527a6be80a1d5ce1a18e3 Mon Sep 17 00:00:00 2001 From: fanquake Date: Fri, 6 Jan 2023 10:27:24 +0000 Subject: [PATCH] Merge bitcoin/bitcoin#26557: build: Update Boost to 1.81.0 in depends 2427468f27ab5db0872b5edfc069cdf702e03d19 doc: Update Boost version in doc/dependencies.md (Hennadii Stepanov) e8b4201ba2fd7745edc26543704d2b4a51dbb151 build: Update Boost to 1.81.0 in depends (Hennadii Stepanov) Pull request description: Required for https://github.com/bitcoin/bitcoin/pull/25696, also see https://github.com/bitcoin/bitcoin/pull/25696#discussion_r1005600540. Guix build: ``` 0aade9c6a91d8550dea6cb07d4657c299a78d4434c1e78ef487e30e53239da64 guix-build-e8b4201ba2fd/output/aarch64-linux-gnu/SHA256SUMS.part f21964d25f96bca46ced3286b00e7e605d6517a6de7b00aa7ebf3bb6ee63d0d2 guix-build-e8b4201ba2fd/output/aarch64-linux-gnu/bitcoin-e8b4201ba2fd-aarch64-linux-gnu-debug.tar.gz 65e991407232714455a4bb5fb072b3b7f58f8f4696ca78b6756aae6e6497540b guix-build-e8b4201ba2fd/output/aarch64-linux-gnu/bitcoin-e8b4201ba2fd-aarch64-linux-gnu.tar.gz 92535c8b7ead8f3319858e55c7d076b3db174efd10b4b8dce8efbbd5e5b98819 guix-build-e8b4201ba2fd/output/arm-linux-gnueabihf/SHA256SUMS.part 9cd199415fbfe6ee6fdf5c57def2591327c97e7e31c4c7b323a738761fe6a285 guix-build-e8b4201ba2fd/output/arm-linux-gnueabihf/bitcoin-e8b4201ba2fd-arm-linux-gnueabihf-debug.tar.gz e13dacef38e68bb30283fda82bbf73864e5977b4cc6f82be41476246c7f51e90 guix-build-e8b4201ba2fd/output/arm-linux-gnueabihf/bitcoin-e8b4201ba2fd-arm-linux-gnueabihf.tar.gz e4c57c126927c2b40a3bd7c697e8b524140f989094c2a9ff216e1c03e90810da guix-build-e8b4201ba2fd/output/arm64-apple-darwin/SHA256SUMS.part 90b15bd6e8eab3c541a2a057402cf41630e5c72d07bf62b3d2d4d54698b3f03b guix-build-e8b4201ba2fd/output/arm64-apple-darwin/bitcoin-e8b4201ba2fd-arm64-apple-darwin-unsigned.dmg 848c7928d633f19912f340fa6df8b77756d291991dbd849b3d95761bcd445bad guix-build-e8b4201ba2fd/output/arm64-apple-darwin/bitcoin-e8b4201ba2fd-arm64-apple-darwin-unsigned.tar.gz 9880bfc57770372478c56b22b513d91d25a799591a345069e04c3f3a88bfc9ec guix-build-e8b4201ba2fd/output/arm64-apple-darwin/bitcoin-e8b4201ba2fd-arm64-apple-darwin.tar.gz e61cb6337dc1480292300fcd45e9b128c567222911cac3a9209955433e1f413b guix-build-e8b4201ba2fd/output/dist-archive/bitcoin-e8b4201ba2fd.tar.gz fd685ffcd1c5e32c25a84638fd47c5e14d0247dcf7d51e5317fea356f8c8347a guix-build-e8b4201ba2fd/output/powerpc64-linux-gnu/SHA256SUMS.part b710e9123684e459732553b1d6df2912257ac43b315db7f2e9288d95c76ce2b6 guix-build-e8b4201ba2fd/output/powerpc64-linux-gnu/bitcoin-e8b4201ba2fd-powerpc64-linux-gnu-debug.tar.gz ea7878ea044dbfaf9c022de5bf7532bf00b028c8582d24ce67bec917f34869e9 guix-build-e8b4201ba2fd/output/powerpc64-linux-gnu/bitcoin-e8b4201ba2fd-powerpc64-linux-gnu.tar.gz 737d9e054356ea50c7efe964a7b223eb81a7fcc10b235647ffcb588784e7e212 guix-build-e8b4201ba2fd/output/powerpc64le-linux-gnu/SHA256SUMS.part 46de2537ea90ddaced620a7dbfa1379b2d0cc80ae87d6225fef94a7196ff5166 guix-build-e8b4201ba2fd/output/powerpc64le-linux-gnu/bitcoin-e8b4201ba2fd-powerpc64le-linux-gnu-debug.tar.gz 7e10be7f494bd4635477919ca9b9968b62054e0448f2963d1c25f0215361feae guix-build-e8b4201ba2fd/output/powerpc64le-linux-gnu/bitcoin-e8b4201ba2fd-powerpc64le-linux-gnu.tar.gz cfb90022ea23526d8ca26259a06d2ec06a278e8fbcb05d6ba37fa3ef33ba1f77 guix-build-e8b4201ba2fd/output/riscv64-linux-gnu/SHA256SUMS.part ba45d57e19758682991fc51cc04c0e13e7e586b74ae1adae0273cd15bdd5cdb2 guix-build-e8b4201ba2fd/output/riscv64-linux-gnu/bitcoin-e8b4201ba2fd-riscv64-linux-gnu-debug.tar.gz 970941bee4c342b7b23065ce515d5e340b3aed989210a569faa33f638a3575f9 guix-build-e8b4201ba2fd/output/riscv64-linux-gnu/bitcoin-e8b4201ba2fd-riscv64-linux-gnu.tar.gz 3943c224a3fa0554ca75292f301ae02514c7ec100d9e13e185ed6ad4db932194 guix-build-e8b4201ba2fd/output/x86_64-apple-darwin/SHA256SUMS.part 4c5f14af1961e33336423a2021b5da76b550ae1bc2284003d6009b1ced940eea guix-build-e8b4201ba2fd/output/x86_64-apple-darwin/bitcoin-e8b4201ba2fd-x86_64-apple-darwin-unsigned.dmg 3ab7fd5623b414c4e0504c2943b84048524374150e9626b3a0b6931adc46109a guix-build-e8b4201ba2fd/output/x86_64-apple-darwin/bitcoin-e8b4201ba2fd-x86_64-apple-darwin-unsigned.tar.gz 00c4c2da392eaee439984ab2bd614d2df6b48ba775350b2c6d48c3061e7667c5 guix-build-e8b4201ba2fd/output/x86_64-apple-darwin/bitcoin-e8b4201ba2fd-x86_64-apple-darwin.tar.gz df20f8a3c8836ca5b7bac4c5104a31f4be76da75a67846d69cc8cbdf42339743 guix-build-e8b4201ba2fd/output/x86_64-linux-gnu/SHA256SUMS.part 68f72876397bfbf6cde73b8303bd081235407211d684cdb78fc932ffb0752942 guix-build-e8b4201ba2fd/output/x86_64-linux-gnu/bitcoin-e8b4201ba2fd-x86_64-linux-gnu-debug.tar.gz 769556d6a4a8baed5dfb81ab63afd1c0999101a5afeb2f7a1bab9b94ce6635bc guix-build-e8b4201ba2fd/output/x86_64-linux-gnu/bitcoin-e8b4201ba2fd-x86_64-linux-gnu.tar.gz 4b8487e9b16e0ec6645cb63ddd25149011797af14d596ed31a23130f201d8f57 guix-build-e8b4201ba2fd/output/x86_64-w64-mingw32/SHA256SUMS.part 6fbad9caf9da6041f0d119be293d0895b50535604f86dda45a7b8345fb581a39 guix-build-e8b4201ba2fd/output/x86_64-w64-mingw32/bitcoin-e8b4201ba2fd-win64-debug.zip 42e84737cac5ec2d2052e5632f68bc6d211d5f02a171cb7347c067025edce13f guix-build-e8b4201ba2fd/output/x86_64-w64-mingw32/bitcoin-e8b4201ba2fd-win64-setup-unsigned.exe 9205f92b1ecfcfa649552e27bb0942611dfac2a5f99c326b7de89bbeb46ad564 guix-build-e8b4201ba2fd/output/x86_64-w64-mingw32/bitcoin-e8b4201ba2fd-win64-unsigned.tar.gz 098d98161393e663da794cc336de8a4676fd2c8bc14dbc8b1cac1aaf6b4098f5 guix-build-e8b4201ba2fd/output/x86_64-w64-mingw32/bitcoin-e8b4201ba2fd-win64.zip ``` ACKs for top commit: fanquake: ACK 2427468f27ab5db0872b5edfc069cdf702e03d19 Tree-SHA512: 31d268e4608ab75f843c0cb1874d060cea762ebbd09b220a7f84054fb837f60b41b8452c181a4de7aa3f8aa27fd584d0a84e770209e02adfb978d2b5f625d7a6 --- depends/packages/boost.mk | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/depends/packages/boost.mk b/depends/packages/boost.mk index ae4006de3fa4c..14bf4e5f1702a 100644 --- a/depends/packages/boost.mk +++ b/depends/packages/boost.mk @@ -1,8 +1,8 @@ package=boost -$(package)_version=1.77.0 +$(package)_version=1.81.0 $(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/ $(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2 -$(package)_sha256_hash=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854 +$(package)_sha256_hash=71feeed900fbccca04a3b4f2f84a7c217186f28a940ed8b7ed4725986baf99fa $(package)_dependencies=native_b2 define $(package)_set_vars @@ -39,14 +39,6 @@ $(package)_cxxflags_android=-fPIC $(package)_cxxflags_x86_64=-fcf-protection=full endef -# Fix unused variable in boost_process, can be removed after upgrading to 1.72 -# Fix missing unary_function in clang15 on macos, can be removed after upgrading to 1.81 -define $(package)_preprocess_cmds - sed -i.old "s/int ret_sig = 0;//" boost/process/detail/posix/wait_group.hpp && \ - sed -i.old "s/unary_function/$(unary_function)/" boost/container_hash/hash.hpp && \ - echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : \"$($(package)_cflags)\" \"$($(package)_cxxflags)\" \"$($(package)_cppflags)\" \"$($(package)_ldflags)\" \"$($(package)_ar)\" \"$(host_STRIP)\" \"$(host_RANLIB)\" \"$(host_WINDRES)\" : ;" > user-config.jam -endef - define $(package)_config_cmds ./bootstrap.sh --without-icu --with-libraries=$($(package)_config_libraries) --with-toolset=$($(package)_toolset_$(host_os)) --with-bjam=b2 endef