Skip to content

Commit d4456d7

Browse files
evoskuilevoskuil
committed
Remove boost chrono, make json/container header only, no import header only.
1 parent 23b07a1 commit d4456d7

File tree

11 files changed

+2
-47
lines changed

11 files changed

+2
-47
lines changed

‎builds/cmake/CMakeLists.txt‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,6 @@ if (enable-ndebug)
126126
add_definitions( -DNDEBUG )
127127
endif()
128128

129-
# Inherit -Denable-shared and define BOOST_ALL_DYN_LINK.
130-
#------------------------------------------------------------------------------
131-
if (BUILD_SHARED_LIBS)
132-
add_definitions( -DBOOST_ALL_DYN_LINK )
133-
endif()
134-
135129
if (BUILD_SHARED_LIBS)
136130
set( Boost_USE_STATIC_LIBS "off" )
137131
else()

‎builds/msvc/vs2022/libbitcoin-protocol-test/libbitcoin-protocol-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-protocol-test/libbitcoin-protocol-test.vcxproj‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,9 @@
144144
<ImportGroup Label="ExtensionSettings">
145145
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
146146
<Import Project="$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" />
147-
<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')" />
148-
<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')" />
149147
<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')" />
150-
<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')" />
151148
<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')" />
152149
<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')" />
153-
<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')" />
154150
<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')" />
155151
<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')" />
156152
<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')" />
@@ -161,13 +157,9 @@
161157
</PropertyGroup>
162158
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
163159
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets'))" />
164-
<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'))" />
165-
<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'))" />
166160
<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'))" />
167-
<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'))" />
168161
<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'))" />
169162
<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'))" />
170-
<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'))" />
171163
<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'))" />
172164
<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'))" />
173165
<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-protocol-test/packages.config‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
1010
<package id="libzmq_vc143" version="4.3.2" 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" />
1311
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
14-
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1512
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1613
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
17-
<package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
1814
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1915
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
2016
<package id="boost_unit_test_framework-vc143" version="1.86.0" targetFramework="Native" />

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,13 +167,9 @@
167167
<ImportGroup Label="ExtensionSettings">
168168
<Import Project="$(NuGetPackageRoot)boost.1.86.0\build\boost.targets" Condition="Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" />
169169
<Import Project="$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets" Condition="Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" />
170-
<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')" />
171-
<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')" />
172170
<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')" />
173-
<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')" />
174171
<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')" />
175172
<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')" />
176-
<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')" />
177173
<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')" />
178174
<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')" />
179175
</ImportGroup>
@@ -183,13 +179,9 @@
183179
</PropertyGroup>
184180
<Error Condition="!Exists('$(NuGetPackageRoot)boost.1.86.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)boost.1.86.0\build\boost.targets'))" />
185181
<Error Condition="!Exists('$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libzmq_vc143.4.3.2\build\native\libzmq_vc143.targets'))" />
186-
<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'))" />
187-
<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'))" />
188182
<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'))" />
189-
<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'))" />
190183
<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'))" />
191184
<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'))" />
192-
<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'))" />
193185
<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'))" />
194186
<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'))" />
195187
</Target>

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,9 @@
88
<packages>
99
<package id="boost" version="1.86.0" targetFramework="Native" />
1010
<package id="libzmq_vc143" version="4.3.2" 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" />
1311
<package id="boost_iostreams-vc143" version="1.86.0" targetFramework="Native" />
14-
<package id="boost_json-vc143" version="1.86.0" targetFramework="Native" />
1512
<package id="boost_locale-vc143" version="1.86.0" targetFramework="Native" />
1613
<package id="boost_program_options-vc143" version="1.86.0" targetFramework="Native" />
17-
<package id="boost_system-vc143" version="1.86.0" targetFramework="Native" />
1814
<package id="boost_thread-vc143" version="1.86.0" targetFramework="Native" />
1915
<package id="secp256k1_vc143" version="0.1.0.21" targetFramework="Native" />
2016
</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: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ AC_ARG_ENABLE([ndebug],
109109
AC_MSG_RESULT([$enable_ndebug])
110110
AS_CASE([${enable_ndebug}], [yes], AC_DEFINE([NDEBUG]))
111111

112-
# Inherit --enable-shared and define BOOST_ALL_DYN_LINK.
113-
#------------------------------------------------------------------------------
114-
AS_CASE([${enable_shared}], [yes], AC_DEFINE([BOOST_ALL_DYN_LINK]))
115-
116112
# Implement --enable-isystem.
117113
#------------------------------------------------------------------------------
118114
AC_MSG_CHECKING([--enable-isystem option])

‎install-cmake.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1034,13 +1034,9 @@ ICU_OPTIONS=(
10341034
# Define boost options.
10351035
#------------------------------------------------------------------------------
10361036
BOOST_OPTIONS=(
1037-
"--with-chrono" \
10381037
"--with-iostreams" \
1039-
"--with-json" \
10401038
"--with-locale" \
10411039
"--with-program_options" \
1042-
"--with-system" \
1043-
"--with-thread" \
10441040
"--with-test")
10451041

10461042
# Define secp256k1 options.

‎install-cmakepresets.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,13 +1076,9 @@ ICU_OPTIONS=(
10761076
# Define boost options.
10771077
#------------------------------------------------------------------------------
10781078
BOOST_OPTIONS=(
1079-
"--with-chrono" \
10801079
"--with-iostreams" \
1081-
"--with-json" \
10821080
"--with-locale" \
10831081
"--with-program_options" \
1084-
"--with-system" \
1085-
"--with-thread" \
10861082
"--with-test")
10871083

10881084
# Define secp256k1 options.

0 commit comments

Comments
 (0)