Skip to content

Commit a7bc012

Browse files
evoskuilevoskuil
authored
Merge pull request #464 from evoskuil/master
Reduce boost dependencies, no nuget import headers, bump to 1.86.0.
2 parents 98c29ec + 13f13e8 commit a7bc012

File tree

15 files changed

+45
-94
lines changed

15 files changed

+45
-94
lines changed

‎Makefile.am‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ doc_DATA = \
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-network.la
3535
src_libbitcoin_network_la_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
36-
src_libbitcoin_network_la_LIBADD = ${boost_regex_LIBS} ${bitcoin_system_LIBS}
36+
src_libbitcoin_network_la_LIBADD = ${bitcoin_system_LIBS}
3737
src_libbitcoin_network_la_SOURCES = \
3838
src/error.cpp \
3939
src/memory.cpp \
@@ -122,7 +122,7 @@ TESTS = libbitcoin-network-test_runner.sh
122122

123123
check_PROGRAMS = test/libbitcoin-network-test
124124
test_libbitcoin_network_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
125-
test_libbitcoin_network_test_LDADD = src/libbitcoin-network.la ${boost_unit_test_framework_LIBS} ${boost_regex_LIBS} ${bitcoin_system_LIBS}
125+
test_libbitcoin_network_test_LDADD = src/libbitcoin-network.la ${boost_unit_test_framework_LIBS} ${bitcoin_system_LIBS}
126126
test_libbitcoin_network_test_SOURCES = \
127127
test/error.cpp \
128128
test/main.cpp \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,11 +140,9 @@ endif()
140140

141141
# Find boost
142142
#------------------------------------------------------------------------------
143-
find_package( Boost 1.76.0 REQUIRED COMPONENTS
144-
regex
143+
find_package( Boost 1.86.0 REQUIRED COMPONENTS
145144
unit_test_framework )
146145

147-
set( boost_regex_LIBS "-lboost_regex" )
148146
set( boost_unit_test_framework_LIBS "-lboost_unit_test_framework" )
149147

150148
set( Boost_LIBRARY_DIR $<IF:$<BOOL:${enable-ndebug}>,"${Boost_LIBRARY_DIR_RELEASE}","${Boost_LIBRARY_DIR_DEBUG}">)
@@ -214,7 +212,6 @@ endif()
214212
# Define project common libraries.
215213
#------------------------------------------------------------------------------
216214
link_libraries(
217-
${Boost_REGEX_LIBRARY}
218215
${bitcoin_system_FOR_BUILD_LIBRARIES} )
219216

220217
# Define ${CANONICAL_LIB_NAME} project.
@@ -327,7 +324,6 @@ endif()
327324
# ${CANONICAL_LIB_NAME} project specific libraries/linker flags.
328325
#------------------------------------------------------------------------------
329326
target_link_libraries( ${CANONICAL_LIB_NAME}
330-
${Boost_REGEX_LIBRARY}
331327
${bitcoin_system_FOR_BUILD_LIBRARIES} )
332328

333329
# Define libbitcoin-network-test project.

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<ItemDefinitionGroup>
1313
<ClCompile>
1414
<EnablePREfast>false</EnablePREfast>
15-
<!--<PreprocessorDefinitions Condition="'$(DefaultLinkage)' == 'dynamic'">BOOST_TEST_DYN_LINK;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
1615
</ClCompile>
1716
<PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
1817
<Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,14 +220,9 @@
220220
<ImportGroup Label="ExtensionTargets" />
221221
<ImportGroup Label="ExtensionSettings">
222222
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
223-
<Import Project="$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets')" />
224-
<Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" />
225-
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
226223
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" />
227-
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
228224
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
229225
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
230-
<Import Project="$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" />
231226
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
232227
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
233228
<Import Project="$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" />
@@ -237,14 +232,9 @@
237232
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
238233
</PropertyGroup>
239234
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
240-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets'))" />
241-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets'))" />
242-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
243235
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets'))" />
244-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
245236
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
246237
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
247-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets'))" />
248238
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
249239
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
250240
<Error Condition="!Exists('$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_unit_test_framework-vc143.1.86.0\build\boost_unit_test_framework-vc143.targets'))" />

‎builds/msvc/vs2022/libbitcoin-network-test/packages.config‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@
77
-->
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
10-
<package id="boost_regex-vc143" version="1.86.0" targetFramework="Native" />
11-
<package id="boost_chrono-vc143" version="1.86.0" targetFramework="Native" />
12-
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
1310
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
14-
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1511
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1612
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
17-
<package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
1813
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1914
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
2015
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />

‎builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,9 @@
330330
<ImportGroup Label="ExtensionTargets" />
331331
<ImportGroup Label="ExtensionSettings">
332332
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
333-
<Import Project="$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets')" />
334-
<Import Project="$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" />
335-
<Import Project="$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" />
336333
<Import Project="$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" />
337-
<Import Project="$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" />
338334
<Import Project="$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" />
339335
<Import Project="$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" />
340-
<Import Project="$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" />
341336
<Import Project="$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets" Condition="Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" />
342337
<Import Project="$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" />
343338
</ImportGroup>
@@ -346,14 +341,9 @@
346341
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
347342
</PropertyGroup>
348343
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
349-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_regex-vc143.1.86.0\build\boost_regex-vc143.targets'))" />
350-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_chrono-vc143.1.86.0\build\boost_chrono-vc143.targets'))" />
351-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_container-vc143.1.86.0\build\boost_container-vc143.targets'))" />
352344
<Error Condition="!Exists('$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_iostreams-vc143.1.86.0\build\boost_iostreams-vc143.targets'))" />
353-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_json-vc143.1.86.0\build\boost_json-vc143.targets'))" />
354345
<Error Condition="!Exists('$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_locale-vc143.1.86.0\build\boost_locale-vc143.targets'))" />
355346
<Error Condition="!Exists('$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_program_options-vc143.1.86.0\build\boost_program_options-vc143.targets'))" />
356-
<Error Condition="!Exists('$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_system-vc143.1.86.0\build\boost_system-vc143.targets'))" />
357347
<Error Condition="!Exists('$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost_thread-vc143.1.86.0\build\boost_thread-vc143.targets'))" />
358348
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc143.0.1.0.21\build\native\secp256k1_vc143.targets'))" />
359349
</Target>

‎builds/msvc/vs2022/libbitcoin-network/packages.config‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,9 @@
77
-->
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
10-
<package id="boost_regex-vc143" version="1.86.0" targetFramework="Native" />
11-
<package id="boost_chrono-vc143" version="1.86.0" targetFramework="Native" />
12-
<package id="boost_container-vc143" version="1.86.0" targetFramework="Native" />
1310
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
14-
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1511
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1612
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
17-
<package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
1813
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1914
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
2015
</packages>

‎builds/msvc/vs2022/libbitcoin-system.import.props‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
<!-- NOMINMAX enables use of std::min/max without conflict. -->
5151
<!-- WIN32_LEAN_AND_MEAN avoids inclusion of certain headers, winsock.h conflicts with boost and protocol use of winsock2.h. -->
5252
<PreprocessorDefinitions>WITH_ICU;WIN32_LEAN_AND_MEAN;NOMINMAX;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
53+
<!-- Disable auto-linking for all boost-json and its dependency boost-container so they can be header only. -->
54+
<PreprocessorDefinitions>BOOST_JSON_NO_LIB;BOOST_CONTAINER_NO_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5355
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-system)' == 'static' Or '$(Linkage-libbitcoin-system)' == 'ltcg'">BC_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5456
<PreprocessorDefinitions Condition="$(Configuration.IndexOf('Debug')) != -1">_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5557
<!-- Enable use of CPU intrinsics. -->

‎configure.ac‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,28 +213,24 @@ AS_CASE([${CC}], [*],
213213

214214
# Check dependencies.
215215
#==============================================================================
216-
# Require Boost of at least version 1.76.0 and output ${boost_CPPFLAGS/LDFLAGS}.
216+
# Require Boost of at least version 1.86.0 and output ${boost_CPPFLAGS/LDFLAGS}.
217217
#------------------------------------------------------------------------------
218218
AS_CASE([${CC}], [*],
219-
[AX_BOOST_BASE([1.76.0],
219+
[AX_BOOST_BASE([1.86.0],
220220
[AC_SUBST([boost_CPPFLAGS], [${BOOST_CPPFLAGS}])
221221
AC_SUBST([boost_ISYS_CPPFLAGS], [`echo ${BOOST_CPPFLAGS} | $SED s/^-I/-isystem/g | $SED s/' -I'/' -isystem'/g`])
222222
AC_SUBST([boost_LDFLAGS], [${BOOST_LDFLAGS}])
223223
AC_MSG_NOTICE([boost_CPPFLAGS : ${boost_CPPFLAGS}])
224224
AC_MSG_NOTICE([boost_ISYS_CPPFLAGS : ${boost_ISYS_CPPFLAGS}])
225225
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
226-
[AC_MSG_ERROR([Boost 1.76.0 or later is required but was not found.])])])
226+
[AC_MSG_ERROR([Boost 1.86.0 or later is required but was not found.])])])
227227

228228
AS_CASE([${enable_isystem}],[yes],
229229
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_ISYS_CPPFLAGS}])],
230230
[AC_SUBST([boost_BUILD_CPPFLAGS], [${boost_CPPFLAGS}])])
231231

232232
AC_MSG_NOTICE([boost_BUILD_CPPFLAGS : ${boost_BUILD_CPPFLAGS}])
233233

234-
AX_BOOST_REGEX
235-
AC_SUBST([boost_regex_LIBS], [${BOOST_REGEX_LIB}])
236-
AC_MSG_NOTICE([boost_regex_LIBS : ${boost_regex_LIBS}])
237-
238234
AS_CASE([${with_tests}], [yes],
239235
[AX_BOOST_UNIT_TEST_FRAMEWORK
240236
AC_SUBST([boost_unit_test_framework_LIBS], [${BOOST_UNIT_TEST_FRAMEWORK_LIB}])

‎include/bitcoin/network/boost.hpp‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,29 +21,14 @@
2121

2222
#include <bitcoin/network/version.hpp>
2323

24-
// "By default, enable_current_exception and enable_error_info are integrated
25-
// directly in the throw_exception function. Defining BOOST_EXCEPTION_DISABLE
26-
// disables this integration."
27-
// www.boost.org/doc/libs/1_78_0/libs/exception/doc/configuration_macros.html
28-
// This does not prevent interfaces that are documented to throw from doing so.
29-
// It only prevents boost from internally wrapping the exception object with
30-
// another class (in boost/throw_exception.hpp). Nearly all instances of the
31-
// internal boost exceptions affecting this library occur in streambuf and are
32-
// caught and presumed discarded in std::istream (standards allow propagation).
33-
// See more comments in streamers.hpp on streams that may throw exceptions.
34-
// Must be set on the command line to ensure it is captured by all includes.
35-
////#define BOOST_EXCEPTION_DISABLE
36-
3724
// Avoid namespace conflict between boost::placeholders and std::placeholders.
3825
// This arises when including <functional>, which declares std::placeholders.
3926
// www.boost.org/doc/libs/1_78_0/boost/bind.hpp
4027
#define BOOST_BIND_NO_PLACEHOLDERS
4128

42-
// Include boost in cpp files only from here, so placeholders exclusion works.
43-
// Avoid use in header includes due to warning repetition (boost/format.hpp).
29+
// Include boost only from here, so placeholders exclusion works.
4430
#include <boost/asio.hpp>
4531
#include <boost/circular_buffer.hpp>
46-
#include <boost/regex.hpp>
4732
#include <boost/system/error_code.hpp>
4833

4934
#endif

0 commit comments

Comments
 (0)