Skip to content

Commit 06e1d7d

Browse files
committed
build: don't build or use Boost Thread
1 parent 7097add commit 06e1d7d

File tree

6 files changed

+5
-196
lines changed

6 files changed

+5
-196
lines changed

build-aux/m4/ax_boost_thread.m4

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

build_msvc/bitcoin_config.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
/* define if the Boost::System library is available */
5757
#define HAVE_BOOST_SYSTEM /**/
5858

59-
/* define if the Boost::Thread library is available */
60-
#define HAVE_BOOST_THREAD /**/
61-
6259
/* define if the Boost::Unit_Test_Framework library is available */
6360
#define HAVE_BOOST_UNIT_TEST_FRAMEWORK /**/
6461

configure.ac

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -651,7 +651,7 @@ case $host in
651651
AC_MSG_ERROR("windres not found")
652652
fi
653653

654-
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
654+
CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -D_WIN32_WINNT=0x0601 -D_WIN32_IE=0x0501 -DWIN32_LEAN_AND_MEAN"
655655

656656
dnl libtool insists upon adding -nostdlib and a list of objects/libs to link against.
657657
dnl That breaks our ability to build dll's with static libgcc/libstdc++/libssp. Override
@@ -1371,7 +1371,6 @@ if test x$want_boost = xno; then
13711371
fi
13721372
AX_BOOST_SYSTEM
13731373
AX_BOOST_FILESYSTEM
1374-
AX_BOOST_THREAD
13751374

13761375
dnl Opt-in to boost-process
13771376
AS_IF([ test x$with_boost_process != x ], [ AX_BOOST_PROCESS ], [ ax_cv_boost_process=no ] )
@@ -1385,7 +1384,7 @@ dnl counter implementations. In 1.63 and later the std::atomic approach is defau
13851384
m4_pattern_allow(DBOOST_AC_USE_STD_ATOMIC) dnl otherwise it's treated like a macro
13861385
BOOST_CPPFLAGS="-DBOOST_SP_USE_STD_ATOMIC -DBOOST_AC_USE_STD_ATOMIC $BOOST_CPPFLAGS"
13871386

1388-
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_THREAD_LIB"
1387+
BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB"
13891388
fi
13901389

13911390
if test x$use_reduce_exports = xyes; 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=filesystem,system,thread,test
25+
$(package)_config_libraries=filesystem,system,test
2626
$(package)_cxxflags=-std=c++17 -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
@@ -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-system-dev libboost-filesystem-dev libboost-test-dev libboost-thread-dev
85+
sudo apt-get install libevent-dev libboost-system-dev libboost-filesystem-dev libboost-test-dev
8686

8787
BerkeleyDB is required for the wallet.
8888

src/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ endif
683683
bitcoin_util_SOURCES = bitcoin-util.cpp
684684
bitcoin_util_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
685685
bitcoin_util_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
686-
bitcoin_util_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
686+
bitcoin_util_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
687687

688688
if TARGET_WINDOWS
689689
bitcoin_util_SOURCES += bitcoin-util-res.rc

0 commit comments

Comments
 (0)