Skip to content

Commit 5d92ac2

Browse files
committed
Merge #18264: build: Remove Boost Chrono
ad34590 doc: remove Boost Chrono from install docs (fanquake) e21fa54 test: remove Boost Chrono installation from CI (fanquake) bd37f2b build: remove Boost Chrono detection from build system (fanquake) 1d0a87e build: remove chrono package from depends Boost (fanquake) Pull request description: We no longer use Boost Chrono. ACKs for top commit: practicalswift: ACK ad34590 MarcoFalke: ACK ad34590 kallewoof: ACK ad34590 Tree-SHA512: d987ab5461c76c982318c65ec8d625094356716b79fd3a462beea75f07db0f82608ace13ec4c4b0233f352508715a4505ac2b4ed1c1e9d9d78f0da936b80f0f3
2 parents 1a97c9a + ad34590 commit 5d92ac2

10 files changed

+8
-130
lines changed

build-aux/m4/ax_boost_chrono.m4

Lines changed: 0 additions & 118 deletions
This file was deleted.

build_msvc/bitcoin_config.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
/* define if the Boost library is available */
4848
#define HAVE_BOOST /**/
4949

50-
/* define if the Boost::Chrono library is available */
51-
#define HAVE_BOOST_CHRONO /**/
52-
5350
/* define if the Boost::Filesystem library is available */
5451
#define HAVE_BOOST_FILESYSTEM /**/
5552

ci/test/00_setup_env_native_asan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_asan
10-
export PACKAGES="clang-8 llvm-8 python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
10+
export PACKAGES="clang-8 llvm-8 python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
1111
# Use clang-8 instead of default clang (which is clang-6 on Bionic) to avoid spurious segfaults when running on ppc64le
1212
export NO_DEPENDS=1
1313
export GOAL="install"

ci/test/00_setup_env_native_fuzz.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_fuzz
10-
export PACKAGES="clang-8 llvm-8 python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev"
10+
export PACKAGES="clang-8 llvm-8 python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev"
1111
export NO_DEPENDS=1
1212
export RUN_UNIT_TESTS=false
1313
export RUN_FUNCTIONAL_TESTS=false

ci/test/00_setup_env_native_fuzz_with_valgrind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_fuzz_valgrind
10-
export PACKAGES="clang-8 llvm-8 python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev valgrind"
10+
export PACKAGES="clang-8 llvm-8 python3 libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev valgrind"
1111
export NO_DEPENDS=1
1212
export RUN_UNIT_TESTS=false
1313
export RUN_FUNCTIONAL_TESTS=false

ci/test/00_setup_env_native_tsan.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_tsan
1010
export DOCKER_NAME_TAG=ubuntu:16.04
11-
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
11+
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libqrencode-dev"
1212
export NO_DEPENDS=1
1313
export GOAL="install"
1414
export BITCOIN_CONFIG="--enable-zmq --disable-wallet --with-gui=qt5 CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' --with-sanitizers=thread --disable-hardening --disable-asm CC=clang CXX=clang++"

ci/test/00_setup_env_native_valgrind.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
export LC_ALL=C.UTF-8
88

99
export CONTAINER_NAME=ci_native_valgrind
10-
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev"
10+
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev"
1111
export USE_VALGRIND=1
1212
export NO_DEPENDS=1
1313
export TEST_RUNNER_EXTRA="p2p_segwit.py" # Only run one test for now. TODO enable all and bump timeouts

configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,7 +1139,6 @@ fi
11391139
AX_BOOST_SYSTEM
11401140
AX_BOOST_FILESYSTEM
11411141
AX_BOOST_THREAD
1142-
AX_BOOST_CHRONO
11431142

11441143
dnl Boost 1.56 through 1.62 allow using std::atomic instead of its own atomic
11451144
dnl counter implementations. In 1.63 and later the std::atomic approach is default.
@@ -1206,7 +1205,7 @@ fi
12061205

12071206
if test x$use_boost = xyes; then
12081207

1209-
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_THREAD_LIB $BOOST_CHRONO_LIB"
1208+
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_THREAD_LIB"
12101209

12111210

12121211
dnl If boost (prior to 1.57) was built without c++11, it emulated scoped enums

depends/packages/boost.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $(package)_config_opts_armv7a_android=address-model=32
2222
$(package)_toolset_$(host_os)=gcc
2323
$(package)_archiver_$(host_os)=$($(package)_ar)
2424
$(package)_toolset_darwin=clang-darwin
25-
$(package)_config_libraries=chrono,filesystem,system,thread,test
25+
$(package)_config_libraries=filesystem,system,thread,test
2626
$(package)_cxxflags=-std=c++11 -fvisibility=hidden
2727
$(package)_cxxflags_linux=-fPIC
2828
$(package)_cxxflags_android=-fPIC

doc/build-unix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Build requirements:
8080

8181
Now, you can either build from self-compiled [depends](/depends/README.md) or install the required dependencies:
8282

83-
sudo apt-get install libevent-dev libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev
83+
sudo apt-get install libevent-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev
8484

8585
BerkeleyDB is required for the wallet.
8686

0 commit comments

Comments
 (0)