feat build: a bunch of fixes for different build issues

Tests: протестировано CI

Author: apolukhin

CMakeLists.txt

@@ -106,6 +106,7 @@ option(USERVER_FEATURE_CLICKHOUSE "Provide asynchronous driver for ClickHouse" $
 option(USERVER_FEATURE_RABBITMQ "Provide asynchronous driver for RabbitMQ" ON)
 option(USERVER_FEATURE_MYSQL "Provide asynchronous driver for MariaDB/MySQL" OFF)
 option(USERVER_FEATURE_UNIVERSAL "Provide a universal utilities library that does not use coroutines" ON)
+option(USERVER_FEATURE_UBOOST_CORO "Use vendored boost context instead of a system one" ON)
 
 if (USERVER_FEATURE_GRPC)
     include(cmake/SetupProtobuf.cmake)
@@ -122,9 +123,17 @@ else()
     add_subdirectory("${USERVER_THIRD_PARTY_DIRS}/boost_stacktrace")
 endif()
 
+if (USERVER_FEATURE_UBOOST_CORO)
+    add_subdirectory(uboost_coro)
+else()
+    find_package(Boost REQUIRED COMPONENTS
+        context
+        coroutine
+    )
+endif()
+
 add_subdirectory(core "${CMAKE_BINARY_DIR}/userver/core")
 add_subdirectory("${USERVER_THIRD_PARTY_DIRS}/compiler-rt")
-add_subdirectory(uboost_coro)
 
 if (USERVER_IS_THE_ROOT_PROJECT)
     add_subdirectory(tools/engine)

cmake/RequireDWCAS.cmake

@@ -72,7 +72,7 @@ cmake_policy(SET CMP0067 NEW)
 try_run(
     RUN_RESULT COMPILE_RESULT
     "${CMAKE_CURRENT_BINARY_DIR}/require_dwcas"
-    "${USERVER_ROOT_DIR}/cmake/RequireDWCAS.cpp"
+    "${CMAKE_CURRENT_LIST_DIR}/RequireDWCAS.cpp"
     CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${Boost_INCLUDE_DIR}"
     COMPILE_DEFINITIONS ${TEST_DEFINITIONS}
     LINK_LIBRARIES ${TEST_LIBRARIES}

core/CMakeLists.txt

@@ -63,8 +63,6 @@ set(CMAKE_THREAD_PREFER_PTHREAD ON)
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 find_package(Boost REQUIRED COMPONENTS
-    context
-    coroutine
     program_options
     filesystem
     locale
@@ -147,16 +145,13 @@ if (USERVER_SANITIZE AND NOT CMAKE_BUILD_TYPE MATCHES "^Rel")
   target_link_libraries(${PROJECT_NAME} PUBLIC userver-compiler-rt-parts)
 endif()
 
-option(USERVER_FEATURE_UBOOST_CORO "Use vendored boost context instead of a system one" ON)
-
 target_link_libraries(${PROJECT_NAME}
   PUBLIC
     Threads::Threads
     Boost::locale
     sanitize-target
     CURL::libcurl
   PRIVATE
-    Boost::coroutine
     Boost::filesystem
     Boost::program_options
     Boost::iostreams
@@ -166,6 +161,7 @@ target_link_libraries(${PROJECT_NAME}
     OpenSSL::SSL
     ZLIB::ZLIB
 )
+
 if (USERVER_FEATURE_UBOOST_CORO)
     target_link_libraries(${PROJECT_NAME}
       PRIVATE

core/src/clients/http/client_test.cpp

@@ -1507,11 +1507,11 @@ UTEST(HttpClient, TestConnectTo) {
   const utest::SimpleServer http_server{cb};
   auto http_client_ptr = utest::CreateHttpClient();
 
-  clients::http::ConnectTo connect_to("0.0.0.0:0:127.0.0.1:" +
+  clients::http::ConnectTo connect_to("0.0.0.0:42:127.0.0.1:" +
                                       std::to_string(http_server.GetPort()));
   auto request = http_client_ptr->CreateRequest()
                      .connect_to(connect_to)
-                     .post("http://0.0.0.0:0", kTestData)
+                     .post("http://0.0.0.0:42", kTestData)
                      .retry(1)
                      .http_version(clients::http::HttpVersion::k11)
                      .timeout(kTimeout);

scripts/docs/en/deps/ubuntu-20.04.md

@@ -2,15 +2,15 @@ ccache
 cmake
 git
 libbenchmark-dev
-libboost-context1.67-dev
-libboost-coroutine1.67-dev
-libboost-filesystem1.67-dev
-libboost-iostreams1.67-dev
-libboost-locale1.67-dev
-libboost-program-options1.67-dev
-libboost-thread1.67-dev
-libboost-regex1.67-dev
-libboost1.67-dev
+libboost-context1.71-dev
+libboost-coroutine1.71-dev
+libboost-filesystem1.71-dev
+libboost-iostreams1.71-dev
+libboost-locale1.71-dev
+libboost-program-options1.71-dev
+libboost-thread1.71-dev
+libboost-regex1.71-dev
+libboost1.71-dev
 libbson-dev
 libcctz-dev
 libcrypto++-dev