Apply boost yamaker helpers to safe subset

44 files changed, 17 insertions, 42 deletions

diff --git a/contrib/restricted/boost/assert/CMakeLists.txt b/contrib/restricted/boost/assert/CMakeLists.txt
index 48143dc4266..909438e2eb2 100644
--- a/contrib/restricted/boost/assert/CMakeLists.txt
+++ b/contrib/restricted/boost/assert/CMakeLists.txt
@@ -13,6 +13,5 @@ target_include_directories(restricted-boost-assert INTERFACE
 )
 target_link_libraries(restricted-boost-assert INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
 )
diff --git a/contrib/restricted/boost/atomic/CMakeLists.txt b/contrib/restricted/boost/atomic/CMakeLists.txt
index c97670ef7ae..5b62fa5258a 100644
--- a/contrib/restricted/boost/atomic/CMakeLists.txt
+++ b/contrib/restricted/boost/atomic/CMakeLists.txt
@@ -10,6 +10,7 @@
 add_library(restricted-boost-atomic)
 target_compile_options(restricted-boost-atomic PRIVATE
   -DBOOST_ATOMIC_SOURCE
+  -Wno-everything
 )
 target_include_directories(restricted-boost-atomic PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/atomic/include
@@ -20,12 +21,12 @@ target_include_directories(restricted-boost-atomic PRIVATE
 )
 target_link_libraries(restricted-boost-atomic PUBLIC
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-align
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-predef
   restricted-boost-preprocessor
+  restricted-boost-static_assert
   restricted-boost-type_traits
 )
 target_sources(restricted-boost-atomic PRIVATE
diff --git a/contrib/restricted/boost/bind/CMakeLists.txt b/contrib/restricted/boost/bind/CMakeLists.txt
index 7d8ced0c66a..f7514deb3c5 100644
--- a/contrib/restricted/boost/bind/CMakeLists.txt
+++ b/contrib/restricted/boost/bind/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-bind INTERFACE
 )
 target_link_libraries(restricted-boost-bind INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
 )
diff --git a/contrib/restricted/boost/config/CMakeLists.txt b/contrib/restricted/boost/config/CMakeLists.txt
index 84d7078ab96..d4faec86437 100644
--- a/contrib/restricted/boost/config/CMakeLists.txt
+++ b/contrib/restricted/boost/config/CMakeLists.txt
@@ -16,5 +16,4 @@ target_include_directories(restricted-boost-config INTERFACE
 )
 target_link_libraries(restricted-boost-config INTERFACE
   contrib-libs-cxxsupp
-  yutil
 )
diff --git a/contrib/restricted/boost/container_hash/CMakeLists.txt b/contrib/restricted/boost/container_hash/CMakeLists.txt
index 87458036ade..db84058b79a 100644
--- a/contrib/restricted/boost/container_hash/CMakeLists.txt
+++ b/contrib/restricted/boost/container_hash/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-container_hash INTERFACE
 )
 target_link_libraries(restricted-boost-container_hash INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
diff --git a/contrib/restricted/boost/conversion/CMakeLists.txt b/contrib/restricted/boost/conversion/CMakeLists.txt
index e363f6cefa0..3fded6d96c3 100644
--- a/contrib/restricted/boost/conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/conversion/CMakeLists.txt
@@ -13,9 +13,9 @@ target_include_directories(restricted-boost-conversion INTERFACE
 )
 target_link_libraries(restricted-boost-conversion INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
+  restricted-boost-core
   restricted-boost-smart_ptr
   restricted-boost-throw_exception
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/core/CMakeLists.txt b/contrib/restricted/boost/core/CMakeLists.txt
index 0ed21cae085..a6e1d86d691 100644
--- a/contrib/restricted/boost/core/CMakeLists.txt
+++ b/contrib/restricted/boost/core/CMakeLists.txt
@@ -13,7 +13,8 @@ target_include_directories(restricted-boost-core INTERFACE
 )
 target_link_libraries(restricted-boost-core INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
+  restricted-boost-static_assert
+  restricted-boost-throw_exception
 )
diff --git a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
index fb7d3ef5df5..9652d17fde2 100644
--- a/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
+++ b/contrib/restricted/boost/dynamic_bitset/CMakeLists.txt
@@ -13,8 +13,9 @@ target_include_directories(restricted-boost-dynamic_bitset INTERFACE
 )
 target_link_libraries(restricted-boost-dynamic_bitset INTERFACE
   contrib-libs-cxxsupp
-  yutil
+  restricted-boost-assert
   restricted-boost-config
+  restricted-boost-container_hash
   restricted-boost-core
   restricted-boost-integer
   restricted-boost-move
diff --git a/contrib/restricted/boost/exception/CMakeLists.txt b/contrib/restricted/boost/exception/CMakeLists.txt
index 2cf4001a752..83a6cec4be1 100644
--- a/contrib/restricted/boost/exception/CMakeLists.txt
+++ b/contrib/restricted/boost/exception/CMakeLists.txt
@@ -8,12 +8,14 @@
 
 
 add_library(restricted-boost-exception)
+target_compile_options(restricted-boost-exception PRIVATE
+  -Wno-everything
+)
 target_include_directories(restricted-boost-exception PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/exception/include
 )
 target_link_libraries(restricted-boost-exception PUBLIC
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
diff --git a/contrib/restricted/boost/foreach/CMakeLists.txt b/contrib/restricted/boost/foreach/CMakeLists.txt
index b44934bb3a1..a9aaa60cfdf 100644
--- a/contrib/restricted/boost/foreach/CMakeLists.txt
+++ b/contrib/restricted/boost/foreach/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-foreach INTERFACE
 )
 target_link_libraries(restricted-boost-foreach INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
   restricted-boost-iterator
diff --git a/contrib/restricted/boost/format/CMakeLists.txt b/contrib/restricted/boost/format/CMakeLists.txt
index fc92ec1e9e8..3582e0d62ca 100644
--- a/contrib/restricted/boost/format/CMakeLists.txt
+++ b/contrib/restricted/boost/format/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-format INTERFACE
 )
 target_link_libraries(restricted-boost-format INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
diff --git a/contrib/restricted/boost/function_types/CMakeLists.txt b/contrib/restricted/boost/function_types/CMakeLists.txt
index 5d0e045d51e..21603334fd5 100644
--- a/contrib/restricted/boost/function_types/CMakeLists.txt
+++ b/contrib/restricted/boost/function_types/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-function_types INTERFACE
 )
 target_link_libraries(restricted-boost-function_types INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
diff --git a/contrib/restricted/boost/fusion/CMakeLists.txt b/contrib/restricted/boost/fusion/CMakeLists.txt
index 46159c34550..157f45712f3 100644
--- a/contrib/restricted/boost/fusion/CMakeLists.txt
+++ b/contrib/restricted/boost/fusion/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-fusion INTERFACE
 )
 target_link_libraries(restricted-boost-fusion INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-container_hash
   restricted-boost-core
diff --git a/contrib/restricted/boost/icl/CMakeLists.txt b/contrib/restricted/boost/icl/CMakeLists.txt
index a6b91c86b2d..f74baa7eded 100644
--- a/contrib/restricted/boost/icl/CMakeLists.txt
+++ b/contrib/restricted/boost/icl/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-icl INTERFACE
 )
 target_link_libraries(restricted-boost-icl INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-concept_check
   restricted-boost-config
@@ -24,6 +23,7 @@ target_link_libraries(restricted-boost-icl INTERFACE
   restricted-boost-iterator
   restricted-boost-move
   restricted-boost-mpl
+  restricted-boost-range
   restricted-boost-rational
   restricted-boost-static_assert
   restricted-boost-type_traits
diff --git a/contrib/restricted/boost/integer/CMakeLists.txt b/contrib/restricted/boost/integer/CMakeLists.txt
index 5b5575efc5e..b071ad8827d 100644
--- a/contrib/restricted/boost/integer/CMakeLists.txt
+++ b/contrib/restricted/boost/integer/CMakeLists.txt
@@ -13,9 +13,9 @@ target_include_directories(restricted-boost-integer INTERFACE
 )
 target_link_libraries(restricted-boost-integer INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
   restricted-boost-static_assert
+  restricted-boost-throw_exception
 )
diff --git a/contrib/restricted/boost/interval/CMakeLists.txt b/contrib/restricted/boost/interval/CMakeLists.txt
index a35c282fb70..bdd6f63a0de 100644
--- a/contrib/restricted/boost/interval/CMakeLists.txt
+++ b/contrib/restricted/boost/interval/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-interval INTERFACE
 )
 target_link_libraries(restricted-boost-interval INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-detail
   restricted-boost-logic
diff --git a/contrib/restricted/boost/intrusive/CMakeLists.txt b/contrib/restricted/boost/intrusive/CMakeLists.txt
index 3ba1f7e062d..957b5d9cefe 100644
--- a/contrib/restricted/boost/intrusive/CMakeLists.txt
+++ b/contrib/restricted/boost/intrusive/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-intrusive INTERFACE
 )
 target_link_libraries(restricted-boost-intrusive INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container_hash
diff --git a/contrib/restricted/boost/io/CMakeLists.txt b/contrib/restricted/boost/io/CMakeLists.txt
index 18573549810..6fc3f3c900d 100644
--- a/contrib/restricted/boost/io/CMakeLists.txt
+++ b/contrib/restricted/boost/io/CMakeLists.txt
@@ -13,6 +13,5 @@ target_include_directories(restricted-boost-io INTERFACE
 )
 target_link_libraries(restricted-boost-io INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
 )
diff --git a/contrib/restricted/boost/iterator/CMakeLists.txt b/contrib/restricted/boost/iterator/CMakeLists.txt
index c3c46f70c29..5729a60ccef 100644
--- a/contrib/restricted/boost/iterator/CMakeLists.txt
+++ b/contrib/restricted/boost/iterator/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-iterator INTERFACE
 )
 target_link_libraries(restricted-boost-iterator INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-concept_check
   restricted-boost-config
diff --git a/contrib/restricted/boost/lambda/CMakeLists.txt b/contrib/restricted/boost/lambda/CMakeLists.txt
index ecd0f17c6f6..5045ce6a95b 100644
--- a/contrib/restricted/boost/lambda/CMakeLists.txt
+++ b/contrib/restricted/boost/lambda/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-lambda INTERFACE
 )
 target_link_libraries(restricted-boost-lambda INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
diff --git a/contrib/restricted/boost/locale/CMakeLists.txt b/contrib/restricted/boost/locale/CMakeLists.txt
index dd9fea72038..6923f40331f 100644
--- a/contrib/restricted/boost/locale/CMakeLists.txt
+++ b/contrib/restricted/boost/locale/CMakeLists.txt
@@ -26,10 +26,12 @@ target_link_libraries(restricted-boost-locale PUBLIC
   restricted-boost-config
   restricted-boost-function
   restricted-boost-iterator
+  restricted-boost-predef
   restricted-boost-smart_ptr
   restricted-boost-static_assert
   restricted-boost-thread
   restricted-boost-type_traits
+  restricted-boost-unordered
 )
 target_sources(restricted-boost-locale PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/boost/locale/src/boost/locale/posix/codecvt.cpp
diff --git a/contrib/restricted/boost/logic/CMakeLists.txt b/contrib/restricted/boost/logic/CMakeLists.txt
index eccc85080da..adc81434101 100644
--- a/contrib/restricted/boost/logic/CMakeLists.txt
+++ b/contrib/restricted/boost/logic/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-logic INTERFACE
 )
 target_link_libraries(restricted-boost-logic INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
 )
diff --git a/contrib/restricted/boost/move/CMakeLists.txt b/contrib/restricted/boost/move/CMakeLists.txt
index 3945334655b..6ea8e336bc7 100644
--- a/contrib/restricted/boost/move/CMakeLists.txt
+++ b/contrib/restricted/boost/move/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-move INTERFACE
 )
 target_link_libraries(restricted-boost-move INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
diff --git a/contrib/restricted/boost/mpl/CMakeLists.txt b/contrib/restricted/boost/mpl/CMakeLists.txt
index 03a3eb4634a..cbad9d763d1 100644
--- a/contrib/restricted/boost/mpl/CMakeLists.txt
+++ b/contrib/restricted/boost/mpl/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-mpl INTERFACE
 )
 target_link_libraries(restricted-boost-mpl INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
   restricted-boost-predef
diff --git a/contrib/restricted/boost/multi_array/CMakeLists.txt b/contrib/restricted/boost/multi_array/CMakeLists.txt
index 02c3ec895dd..32ed6da4339 100644
--- a/contrib/restricted/boost/multi_array/CMakeLists.txt
+++ b/contrib/restricted/boost/multi_array/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-multi_array INTERFACE
 )
 target_link_libraries(restricted-boost-multi_array INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-array
   restricted-boost-assert
   restricted-boost-concept_check
diff --git a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
index ffb9a1d127e..5fc070b8fbf 100644
--- a/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
+++ b/contrib/restricted/boost/numeric_conversion/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-numeric_conversion INTERFACE
 )
 target_link_libraries(restricted-boost-numeric_conversion INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-conversion
   restricted-boost-core
diff --git a/contrib/restricted/boost/phoenix/CMakeLists.txt b/contrib/restricted/boost/phoenix/CMakeLists.txt
index 2f22b5f2255..79782ad58b9 100644
--- a/contrib/restricted/boost/phoenix/CMakeLists.txt
+++ b/contrib/restricted/boost/phoenix/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-phoenix INTERFACE
 )
 target_link_libraries(restricted-boost-phoenix INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
diff --git a/contrib/restricted/boost/predef/CMakeLists.txt b/contrib/restricted/boost/predef/CMakeLists.txt
index 13be637dd06..05a1f70216e 100644
--- a/contrib/restricted/boost/predef/CMakeLists.txt
+++ b/contrib/restricted/boost/predef/CMakeLists.txt
@@ -13,5 +13,4 @@ target_include_directories(restricted-boost-predef INTERFACE
 )
 target_link_libraries(restricted-boost-predef INTERFACE
   contrib-libs-cxxsupp
-  yutil
 )
diff --git a/contrib/restricted/boost/preprocessor/CMakeLists.txt b/contrib/restricted/boost/preprocessor/CMakeLists.txt
index 9645ccd8052..237b030610d 100644
--- a/contrib/restricted/boost/preprocessor/CMakeLists.txt
+++ b/contrib/restricted/boost/preprocessor/CMakeLists.txt
@@ -13,5 +13,4 @@ target_include_directories(restricted-boost-preprocessor INTERFACE
 )
 target_link_libraries(restricted-boost-preprocessor INTERFACE
   contrib-libs-cxxsupp
-  yutil
 )
diff --git a/contrib/restricted/boost/program_options/CMakeLists.txt b/contrib/restricted/boost/program_options/CMakeLists.txt
index 7a095140110..e8458ebf7d0 100644
--- a/contrib/restricted/boost/program_options/CMakeLists.txt
+++ b/contrib/restricted/boost/program_options/CMakeLists.txt
@@ -17,6 +17,7 @@ target_include_directories(restricted-boost-program_options PUBLIC
 target_link_libraries(restricted-boost-program_options PUBLIC
   contrib-libs-cxxsupp
   restricted-boost-any
+  restricted-boost-bind
   restricted-boost-config
   restricted-boost-core
   restricted-boost-detail
diff --git a/contrib/restricted/boost/property_tree/CMakeLists.txt b/contrib/restricted/boost/property_tree/CMakeLists.txt
index 78a81801346..3295bdbf893 100644
--- a/contrib/restricted/boost/property_tree/CMakeLists.txt
+++ b/contrib/restricted/boost/property_tree/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-property_tree INTERFACE
 )
 target_link_libraries(restricted-boost-property_tree INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-any
   restricted-boost-assert
   restricted-boost-bind
diff --git a/contrib/restricted/boost/proto/CMakeLists.txt b/contrib/restricted/boost/proto/CMakeLists.txt
index 51e8e7db824..fd2d65c3f90 100644
--- a/contrib/restricted/boost/proto/CMakeLists.txt
+++ b/contrib/restricted/boost/proto/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-proto INTERFACE
 )
 target_link_libraries(restricted-boost-proto INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
   restricted-boost-fusion
diff --git a/contrib/restricted/boost/ratio/CMakeLists.txt b/contrib/restricted/boost/ratio/CMakeLists.txt
index be55f69ae37..a83b2db714a 100644
--- a/contrib/restricted/boost/ratio/CMakeLists.txt
+++ b/contrib/restricted/boost/ratio/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-ratio INTERFACE
 )
 target_link_libraries(restricted-boost-ratio INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
   restricted-boost-integer
diff --git a/contrib/restricted/boost/rational/CMakeLists.txt b/contrib/restricted/boost/rational/CMakeLists.txt
index 8ea39e5936d..4c4ddfe8e5d 100644
--- a/contrib/restricted/boost/rational/CMakeLists.txt
+++ b/contrib/restricted/boost/rational/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-rational INTERFACE
 )
 target_link_libraries(restricted-boost-rational INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-core
diff --git a/contrib/restricted/boost/static_assert/CMakeLists.txt b/contrib/restricted/boost/static_assert/CMakeLists.txt
index 16d8263bbcc..015fb291bdd 100644
--- a/contrib/restricted/boost/static_assert/CMakeLists.txt
+++ b/contrib/restricted/boost/static_assert/CMakeLists.txt
@@ -13,6 +13,5 @@ target_include_directories(restricted-boost-static_assert INTERFACE
 )
 target_link_libraries(restricted-boost-static_assert INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
 )
diff --git a/contrib/restricted/boost/throw_exception/CMakeLists.txt b/contrib/restricted/boost/throw_exception/CMakeLists.txt
index 1e83db2641b..cf2fd042f22 100644
--- a/contrib/restricted/boost/throw_exception/CMakeLists.txt
+++ b/contrib/restricted/boost/throw_exception/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-throw_exception INTERFACE
 )
 target_link_libraries(restricted-boost-throw_exception INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
 )
diff --git a/contrib/restricted/boost/tokenizer/CMakeLists.txt b/contrib/restricted/boost/tokenizer/CMakeLists.txt
index 6231a3f5389..4060cd2d15d 100644
--- a/contrib/restricted/boost/tokenizer/CMakeLists.txt
+++ b/contrib/restricted/boost/tokenizer/CMakeLists.txt
@@ -13,10 +13,10 @@ target_include_directories(restricted-boost-tokenizer INTERFACE
 )
 target_link_libraries(restricted-boost-tokenizer INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-iterator
   restricted-boost-mpl
   restricted-boost-throw_exception
+  restricted-boost-type_traits
 )
diff --git a/contrib/restricted/boost/tti/CMakeLists.txt b/contrib/restricted/boost/tti/CMakeLists.txt
index aefb5a3f65e..d0e9356d6f3 100644
--- a/contrib/restricted/boost/tti/CMakeLists.txt
+++ b/contrib/restricted/boost/tti/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-tti INTERFACE
 )
 target_link_libraries(restricted-boost-tti INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-function_types
   restricted-boost-mpl
diff --git a/contrib/restricted/boost/tuple/CMakeLists.txt b/contrib/restricted/boost/tuple/CMakeLists.txt
index a3ec6b8b633..2e16ce8330e 100644
--- a/contrib/restricted/boost/tuple/CMakeLists.txt
+++ b/contrib/restricted/boost/tuple/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-tuple INTERFACE
 )
 target_link_libraries(restricted-boost-tuple INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
   restricted-boost-static_assert
diff --git a/contrib/restricted/boost/unordered/CMakeLists.txt b/contrib/restricted/boost/unordered/CMakeLists.txt
index 642d1427440..5ec77e1e817 100644
--- a/contrib/restricted/boost/unordered/CMakeLists.txt
+++ b/contrib/restricted/boost/unordered/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-unordered INTERFACE
 )
 target_link_libraries(restricted-boost-unordered INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-container
diff --git a/contrib/restricted/boost/utility/CMakeLists.txt b/contrib/restricted/boost/utility/CMakeLists.txt
index f017d737370..c5bcdfa3acf 100644
--- a/contrib/restricted/boost/utility/CMakeLists.txt
+++ b/contrib/restricted/boost/utility/CMakeLists.txt
@@ -13,9 +13,9 @@ target_include_directories(restricted-boost-utility INTERFACE
 )
 target_link_libraries(restricted-boost-utility INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-core
+  restricted-boost-io
   restricted-boost-preprocessor
   restricted-boost-static_assert
   restricted-boost-throw_exception
diff --git a/contrib/restricted/boost/variant/CMakeLists.txt b/contrib/restricted/boost/variant/CMakeLists.txt
index a398cee8891..4082f7e5aa0 100644
--- a/contrib/restricted/boost/variant/CMakeLists.txt
+++ b/contrib/restricted/boost/variant/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-variant INTERFACE
 )
 target_link_libraries(restricted-boost-variant INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-bind
   restricted-boost-config
diff --git a/contrib/restricted/boost/winapi/CMakeLists.txt b/contrib/restricted/boost/winapi/CMakeLists.txt
index ae2cf76bcd7..e94a6486705 100644
--- a/contrib/restricted/boost/winapi/CMakeLists.txt
+++ b/contrib/restricted/boost/winapi/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-winapi INTERFACE
 )
 target_link_libraries(restricted-boost-winapi INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-config
   restricted-boost-predef
 )
diff --git a/contrib/restricted/boost/xpressive/CMakeLists.txt b/contrib/restricted/boost/xpressive/CMakeLists.txt
index 4419004e2f7..eaad6e815cd 100644
--- a/contrib/restricted/boost/xpressive/CMakeLists.txt
+++ b/contrib/restricted/boost/xpressive/CMakeLists.txt
@@ -13,7 +13,6 @@ target_include_directories(restricted-boost-xpressive INTERFACE
 )
 target_link_libraries(restricted-boost-xpressive INTERFACE
   contrib-libs-cxxsupp
-  yutil
   restricted-boost-assert
   restricted-boost-config
   restricted-boost-conversion