Skip to content

Commit 0726932

Browse files
committed
build: remove Boost::system usage
1 parent b87f9c5 commit 0726932

File tree

9 files changed

+7
-132
lines changed

9 files changed

+7
-132
lines changed

build-aux/m4/ax_boost_system.m4

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

build_msvc/bitcoin_config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,6 @@
4747
/* define if external signer support is enabled (requires Boost::Process) */
4848
#define ENABLE_EXTERNAL_SIGNER /**/
4949

50-
/* define if the Boost::System library is available */
51-
#define HAVE_BOOST_SYSTEM /**/
52-
5350
/* define if the Boost::Unit_Test_Framework library is available */
5451
#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/
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 llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev"
10+
export PACKAGES="clang llvm python3-zmq qtbase5-dev qttools5-dev-tools libevent-dev bsdmainutils libboost-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libqrencode-dev libsqlite3-dev"
1111
export DOCKER_NAME_TAG=ubuntu:22.04
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
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export DOCKER_NAME_TAG="ubuntu:20.04"
1010
export CONTAINER_NAME=ci_native_fuzz
11-
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-test-dev libsqlite3-dev"
11+
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libboost-test-dev libsqlite3-dev"
1212
export NO_DEPENDS=1
1313
export RUN_UNIT_TESTS=false
1414
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
@@ -8,7 +8,7 @@ export LC_ALL=C.UTF-8
88

99
export DOCKER_NAME_TAG="ubuntu:20.04"
1010
export CONTAINER_NAME=ci_native_fuzz_valgrind
11-
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-test-dev libsqlite3-dev valgrind"
11+
export PACKAGES="clang llvm python3 libevent-dev bsdmainutils libboost-dev libboost-test-dev libsqlite3-dev valgrind"
1212
export NO_DEPENDS=1
1313
export RUN_UNIT_TESTS=false
1414
export RUN_FUNCTIONAL_TESTS=false

ci/test/00_setup_env_native_valgrind.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 DOCKER_NAME_TAG="ubuntu:20.04"
1010
export CONTAINER_NAME=ci_native_valgrind
11-
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-dev libboost-system-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libsqlite3-dev"
11+
export PACKAGES="valgrind clang llvm python3-zmq libevent-dev bsdmainutils libboost-dev libboost-test-dev libdb5.3++-dev libminiupnpc-dev libnatpmp-dev libzmq3-dev libsqlite3-dev"
1212
export USE_VALGRIND=1
1313
export NO_DEPENDS=1
1414
export TEST_RUNNER_EXTRA="--nosandbox --exclude rpc_bind,feature_bind_extra" # Excluded for now, see https://github.com/bitcoin/bitcoin/issues/17765#issuecomment-602068547

configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1407,13 +1407,12 @@ if test "$use_boost" = "yes"; then
14071407
if test "$want_boost" = "no"; then
14081408
AC_MSG_ERROR([only libbitcoinconsensus can be built without Boost])
14091409
fi
1410-
AX_BOOST_SYSTEM
14111410

14121411
if test "$suppress_external_warnings" != "no"; then
14131412
BOOST_CPPFLAGS=SUPPRESS_WARNINGS($BOOST_CPPFLAGS)
14141413
fi
14151414

1416-
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB"
1415+
BOOST_LIBS="$BOOST_LDFLAGS"
14171416
fi
14181417

14191418
if test "$use_external_signer" != "no"; then

depends/packages/boost.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ $(package)_toolset_$(host_os)=clang
2222
else
2323
$(package)_toolset_$(host_os)=gcc
2424
endif
25-
$(package)_config_libraries=system,test
25+
$(package)_config_libraries=test
2626
$(package)_cxxflags+=-std=c++17
2727
$(package)_cxxflags_linux=-fPIC
2828
$(package)_cxxflags_freebsd=-fPIC

doc/build-unix.md

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

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

85-
sudo apt-get install libevent-dev libboost-dev libboost-system-dev libboost-test-dev
85+
sudo apt-get install libevent-dev libboost-dev libboost-test-dev
8686

8787
SQLite is required for the descriptor wallet:
8888

0 commit comments

Comments
 (0)