2014-07-23 07:31:30 +02:00
|
|
|
package=boost
|
2022-02-23 18:00:06 +01:00
|
|
|
$(package)_version=1.77.0
|
2022-02-13 12:17:33 +01:00
|
|
|
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$($(package)_version)/source/
|
|
|
|
|
$(package)_file_name=boost_$(subst .,_,$($(package)_version)).tar.bz2
|
2022-02-23 18:00:06 +01:00
|
|
|
$(package)_sha256_hash=fc9f85fc030e233142908241af7a846e60630aa7388de9a5fafb1f3a26840854
|
2021-08-27 21:12:09 +02:00
|
|
|
$(package)_dependencies=native_b2
|
2014-07-23 07:31:30 +02:00
|
|
|
|
|
|
|
|
define $(package)_set_vars
|
2014-09-23 23:03:09 +02:00
|
|
|
$(package)_config_opts_release=variant=release
|
|
|
|
|
$(package)_config_opts_debug=variant=debug
|
2014-07-23 07:31:30 +02:00
|
|
|
$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam
|
2021-08-27 21:12:09 +02:00
|
|
|
$(package)_config_opts+=threading=multi link=static -sNO_COMPRESSION=1
|
2020-04-29 22:30:40 +02:00
|
|
|
$(package)_config_opts_linux=target-os=linux threadapi=pthread runtime-link=shared
|
|
|
|
|
$(package)_config_opts_darwin=target-os=darwin runtime-link=shared
|
|
|
|
|
$(package)_config_opts_mingw32=target-os=windows binary-format=pe threadapi=win32 runtime-link=static
|
2021-08-27 21:12:09 +02:00
|
|
|
$(package)_config_opts_x86_64=architecture=x86 address-model=64
|
|
|
|
|
$(package)_config_opts_i686=architecture=x86 address-model=32
|
|
|
|
|
$(package)_config_opts_aarch64=address-model=64
|
|
|
|
|
$(package)_config_opts_armv7a=address-model=32
|
2021-11-24 05:32:59 +01:00
|
|
|
$(package)_config_opts_i686_android=address-model=32
|
|
|
|
|
$(package)_config_opts_aarch64_android=address-model=64
|
|
|
|
|
$(package)_config_opts_x86_64_android=address-model=64
|
|
|
|
|
$(package)_config_opts_armv7a_android=address-model=32
|
2023-10-12 17:57:46 +02:00
|
|
|
unary_function=unary_function
|
2020-04-29 22:30:40 +02:00
|
|
|
ifneq (,$(findstring clang,$($(package)_cxx)))
|
2021-08-27 21:12:09 +02:00
|
|
|
$(package)_toolset_$(host_os)=clang
|
2023-10-12 17:57:46 +02:00
|
|
|
ifeq ($(build_os),darwin)
|
|
|
|
|
unary_function=__unary_function
|
|
|
|
|
endif
|
2021-08-27 21:12:09 +02:00
|
|
|
else
|
|
|
|
|
$(package)_toolset_$(host_os)=gcc
|
2020-04-29 22:30:40 +02:00
|
|
|
endif
|
Merge #21064: refactor: use std::shared_mutex & remove Boost Thread
060a2a64d40d75fecb60b7d2b9946a67e46aa6fc ci: remove boost thread installation (fanquake)
06e1d7d81d5a56d136c6fc88f09a2b0654a164f9 build: don't build or use Boost Thread (fanquake)
7097add83c8596f81be9edd66971ffd2486357eb refactor: replace Boost shared_mutex with std shared_mutex in sigcache (fanquake)
8e55981ef834490c438436719f95cbaf888c4914 refactor: replace Boost shared_mutex with std shared_mutex in cuckoocache tests (fanquake)
Pull request description:
This replaces `boost::shared_mutex` and `boost::unique_lock` with [`std::shared_mutex`](https://en.cppreference.com/w/cpp/thread/shared_mutex) & [`std::unique_lock`](https://en.cppreference.com/w/cpp/thread/unique_lock).
Even though [some concerns were raised](https://github.com/bitcoin/bitcoin/issues/16684#issuecomment-726214696) in #16684 with regard to `std::shared_mutex` being unsafe to use across some glibc versions, I still think this change is an improvement. As I mentioned in #21022, I also think trying to restrict standard library feature usage based on bugs in glibc is not only hard to do, but it's not currently clear exactly how we do that in practice (does it also extend to patching out use in our dependencies, should we be implementing more runtime checks for features we are using, when do we consider an affected glibc "old enough" not to worry about? etc). If you take a look through the [glibc bug tracker](https://sourceware.org/bugzilla/describecomponents.cgi?product=glibc) you'll no doubt find plenty of (active) bug reports for standard library code we already using. Obviously not to say we shouldn't try and avoid buggy code where possible.
Two other points:
[Cory mentioned in #21022](https://github.com/bitcoin/bitcoin/pull/21022#issuecomment-769274179):
> It also seems reasonable to me to worry that boost hits the same underlying glibc bug, and we've just not happened to trigger the right conditions yet.
Moving away from Boost to the standard library also removes the potential for differences related to Boosts configuration. Boost has multiple versions of `shared_mutex`, and what you end up using, and what it's backed by depends on:
* The version of Boost.
* The platform you're building for.
* Which version of `BOOST_THREAD_VERSION` is defined: (2,3,4 or 5) default=2. (see [here](https://www.boost.org/doc/libs/1_70_0/doc/html/thread/build.html#thread.build.configuration) for some of the differences).
* Is `BOOST_THREAD_V2_SHARED_MUTEX` defined? (not by default). If so, you might get the ["less performant, but more robust"](https://github.com/boostorg/thread/issues/230#issuecomment-475937761) version of `shared_mutex`.
A lot of these factors are eliminated by our use of depends, but users will have varying configurations. It's also not inconceivable to think that a distro, or some package manager might start defining something like `BOOST_THREAD_VERSION=3`. Boost tried to change the default from 2 to 3 at one point.
With this change, we no longer use Boost Thread, so this PR also removes it from depends, the build system, CI etc.
Previous similar PRs were #19183 & #20922. The authors are included in the commits here.
Also related to #21022 - pthread sanity checking.
ACKs for top commit:
laanwj:
Code review ACK 060a2a64d40d75fecb60b7d2b9946a67e46aa6fc
vasild:
ACK 060a2a64d40d75fecb60b7d2b9946a67e46aa6fc
Tree-SHA512: 572d14d8c9de20bc434511f20d3f431836393ff915b2fe9de5a47a02dca76805ad5c3fc4cceecb4cd43f3ba939a0508178c4e60e62abdbaaa6b3e8db20b75b03
2021-02-12 11:21:05 +01:00
|
|
|
$(package)_config_libraries=filesystem,test
|
2021-10-21 04:52:18 +02:00
|
|
|
$(package)_cxxflags=-std=c++17
|
2014-11-12 00:21:23 +01:00
|
|
|
$(package)_cxxflags_linux=-fPIC
|
2023-06-30 17:51:32 +02:00
|
|
|
$(package)_cxxflags_freebsd=-fPIC
|
2023-06-30 18:00:24 +02:00
|
|
|
$(package)_cxxflags_openbsd=-fPIC
|
2021-11-24 05:32:59 +01:00
|
|
|
$(package)_cxxflags_android=-fPIC
|
2021-12-22 04:18:18 +01:00
|
|
|
$(package)_cxxflags_x86_64=-fcf-protection=full
|
2014-07-23 07:31:30 +02:00
|
|
|
endef
|
|
|
|
|
|
2023-10-12 17:57:46 +02:00
|
|
|
# Fix missing unary_function in clang15 on macos, can be removed after upgrading to 1.81
|
2014-07-23 07:31:30 +02:00
|
|
|
define $(package)_preprocess_cmds
|
2023-10-12 17:57:46 +02:00
|
|
|
sed -i.old "s/unary_function/$(unary_function)/" boost/container_hash/hash.hpp && \
|
2021-08-27 21:12:09 +02:00
|
|
|
echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cflags>\"$($(package)_cflags)\" <cxxflags>\"$($(package)_cxxflags)\" <compileflags>\"$($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_ar)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
|
2014-07-23 07:31:30 +02:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define $(package)_config_cmds
|
2021-08-27 21:12:09 +02:00
|
|
|
./bootstrap.sh --without-icu --with-libraries=$($(package)_config_libraries) --with-toolset=$($(package)_toolset_$(host_os)) --with-bjam=b2
|
2014-07-23 07:31:30 +02:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define $(package)_build_cmds
|
2021-08-27 21:12:09 +02:00
|
|
|
b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) toolset=$($(package)_toolset_$(host_os)) stage
|
2014-07-23 07:31:30 +02:00
|
|
|
endef
|
|
|
|
|
|
|
|
|
|
define $(package)_stage_cmds
|
2021-10-21 04:52:18 +02:00
|
|
|
b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) toolset=$($(package)_toolset_$(host_os)) --no-cmake-config install
|
2014-07-23 07:31:30 +02:00
|
|
|
endef
|