intermediate changes

ref:b4effc9582e42dfa79e9a44a91df283419947b3a

22 files changed, 9 insertions, 79 deletions

diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt
index aa40b3dd92..20f336f42f 100644
--- a/contrib/libs/apache/arrow/CMakeLists.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
 add_library(libs-apache-arrow)
 target_compile_options(libs-apache-arrow PUBLIC
   -DARROW_STATIC
@@ -47,7 +45,6 @@ target_link_libraries(libs-apache-arrow PUBLIC
   contrib-libs-snappy
   contrib-libs-utf8proc
   contrib-libs-xxhash
-  ZLIB::ZLIB
   contrib-libs-zstd
   contrib-restricted-boost
   contrib-restricted-fast_float
diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index 2daf3c5578..70e9663c6d 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
 add_library(libs-apache-orc)
 target_include_directories(libs-apache-orc PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/include
@@ -12,7 +10,6 @@ target_link_libraries(libs-apache-orc PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-lz4
   contrib-libs-snappy
-  ZLIB::ZLIB
   contrib-libs-zstd
   contrib-libs-protobuf
 )
diff --git a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
index a54f538057..8f7e164364 100644
--- a/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
+++ b/contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(libs-aws-sdk-cpp-aws-cpp-sdk-core)
 target_compile_options(libs-aws-sdk-cpp-aws-cpp-sdk-core PRIVATE
   -DAWS_CAL_USE_IMPORT_EXPORT
@@ -32,7 +30,6 @@ target_include_directories(libs-aws-sdk-cpp-aws-cpp-sdk-core PRIVATE
 target_link_libraries(libs-aws-sdk-cpp-aws-cpp-sdk-core PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-curl
-  OpenSSL::OpenSSL
   restricted-aws-aws-c-common
   restricted-aws-aws-c-event-stream
 )
diff --git a/contrib/libs/curl/CMakeLists.txt b/contrib/libs/curl/CMakeLists.txt
index 9288e61ad4..8a91f84ab6 100644
--- a/contrib/libs/curl/CMakeLists.txt
+++ b/contrib/libs/curl/CMakeLists.txt
@@ -1,7 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-find_package(c-ares)
-
 add_library(contrib-libs-curl)
 target_compile_options(contrib-libs-curl PUBLIC
   -DCURL_STATICLIB
@@ -21,10 +17,7 @@ target_include_directories(contrib-libs-curl PRIVATE
 )
 target_link_libraries(contrib-libs-curl PUBLIC
   contrib-libs-libc_compat
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
   contrib-libs-nghttp2
-  c-ares::c-ares
 )
 target_sources(contrib-libs-curl PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/curl/lib/altsvc.c
diff --git a/contrib/libs/grpc/grpc++/CMakeLists.txt b/contrib/libs/grpc/grpc++/CMakeLists.txt
index 84a02f1bda..b7eaacb11f 100644
--- a/contrib/libs/grpc/grpc++/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc++/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(libs-grpc-grpc++)
 target_compile_options(libs-grpc-grpc++ PRIVATE
   -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1
@@ -21,7 +19,6 @@ target_link_libraries(libs-grpc-grpc++ PUBLIC
   src-core-lib
   grpc-third_party-address_sorting
   grpc-third_party-upb
-  OpenSSL::OpenSSL
   abseil-cpp-tstring-y_absl-strings
 )
 target_sources(libs-grpc-grpc++ PRIVATE
diff --git a/contrib/libs/grpc/grpc/CMakeLists.txt b/contrib/libs/grpc/grpc/CMakeLists.txt
index 1857299293..ec2d41b10f 100644
--- a/contrib/libs/grpc/grpc/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc/CMakeLists.txt
@@ -1,7 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-find_package(c-ares)
-
 add_library(libs-grpc-grpc)
 target_compile_options(libs-grpc-grpc PRIVATE
   -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1
@@ -23,13 +19,10 @@ target_link_libraries(libs-grpc-grpc PUBLIC
   contrib-libs-cxxsupp
   yutil
   certs
-  c-ares::c-ares
   src-core-lib
   grpc-third_party-address_sorting
   grpc-third_party-upb
-  OpenSSL::OpenSSL
   contrib-libs-re2
-  ZLIB::ZLIB
   abseil-cpp-tstring-y_absl-hash
   abseil-cpp-tstring-y_absl-meta
   abseil-cpp-tstring-y_absl-status
diff --git a/contrib/libs/hdr_histogram/CMakeLists.txt b/contrib/libs/hdr_histogram/CMakeLists.txt
index 2d987779e8..0e51bb8fab 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.txt
@@ -1,12 +1,9 @@
-find_package(ZLIB)
-
 add_library(contrib-libs-hdr_histogram)
 target_include_directories(contrib-libs-hdr_histogram PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/hdr_histogram/src
 )
 target_link_libraries(contrib-libs-hdr_histogram PUBLIC
   contrib-libs-cxxsupp
-  ZLIB::ZLIB
 )
 target_sources(contrib-libs-hdr_histogram PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/hdr_histogram/src/hdr_encoding.c
diff --git a/contrib/libs/jwt-cpp/CMakeLists.txt b/contrib/libs/jwt-cpp/CMakeLists.txt
index 12571feb65..6b742d5a5b 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.txt
@@ -1,6 +1 @@
-find_package(OpenSSL)
-
 add_library(contrib-libs-jwt-cpp INTERFACE)
-target_link_libraries(contrib-libs-jwt-cpp INTERFACE
-  OpenSSL::OpenSSL
-)
diff --git a/contrib/libs/libaio/CMakeLists.txt b/contrib/libs/libaio/CMakeLists.txt
deleted file mode 100644
index 7f0a0f12b2..0000000000
--- a/contrib/libs/libaio/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_library(contrib-libs-libaio INTERFACE)
diff --git a/contrib/libs/libaio/ya.make b/contrib/libs/libaio/ya.make
index 3eb09b549b..6099250bf5 100644
--- a/contrib/libs/libaio/ya.make
+++ b/contrib/libs/libaio/ya.make
@@ -16,6 +16,13 @@ OWNER(
 
 NO_RUNTIME()
 
+OPENSOURCE_EXPORT_REPLACEMENT(
+    CMAKE AIO
+    CMAKE_TARGET AIO
+)
+
+IF (NOT EXPORT_CMAKE)
+
 IF (USE_DYNAMIC_AIO)
     PEERDIR(
         contrib/libs/libaio/dynamic
@@ -26,6 +33,8 @@ ELSE()
     )
 ENDIF()
 
+ENDIF()
+
 END()
 
 RECURSE(
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.txt b/contrib/libs/libevent/event_openssl/CMakeLists.txt
index 976898ab8c..153d58e7b0 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(libs-libevent-event_openssl)
 target_compile_options(libs-libevent-event_openssl PRIVATE
   -DHAVE_CONFIG_H
@@ -11,7 +9,6 @@ target_include_directories(libs-libevent-event_openssl PRIVATE
 )
 target_link_libraries(libs-libevent-event_openssl PUBLIC
   contrib-libs-libc_compat
-  OpenSSL::OpenSSL
 )
 target_sources(libs-libevent-event_openssl PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/libevent/bufferevent_openssl.c
diff --git a/contrib/libs/libxml/CMakeLists.txt b/contrib/libs/libxml/CMakeLists.txt
index 3efc791fbe..48c2a900d7 100644
--- a/contrib/libs/libxml/CMakeLists.txt
+++ b/contrib/libs/libxml/CMakeLists.txt
@@ -1,6 +1,3 @@
-find_package(Iconv)
-find_package(ZLIB)
-
 add_library(contrib-libs-libxml)
 target_compile_options(contrib-libs-libxml PUBLIC
   -DLIBXML_STATIC
@@ -19,8 +16,6 @@ target_include_directories(contrib-libs-libxml PRIVATE
 target_link_libraries(contrib-libs-libxml PUBLIC
   contrib-libs-cxxsupp
   yutil
-  Iconv::Iconv
-  ZLIB::ZLIB
   library-cpp-charset
 )
 target_sources(contrib-libs-libxml PRIVATE
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
index d45fe3341b..7f33557b1f 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
 add_library(llvm12-lib-Support)
 target_include_directories(llvm12-lib-Support PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Support
@@ -8,7 +6,6 @@ target_link_libraries(llvm12-lib-Support PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-llvm12
   llvm12-lib-Demangle
-  ZLIB::ZLIB
 )
 target_sources(llvm12-lib-Support PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Support/AArch64TargetParser.cpp
diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt
index 39f64a1c98..eeefc74efc 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(libs-poco-Crypto)
 target_include_directories(libs-poco-Crypto PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/include
@@ -11,7 +9,6 @@ target_include_directories(libs-poco-Crypto PRIVATE
 )
 target_link_libraries(libs-poco-Crypto PUBLIC
   contrib-libs-cxxsupp
-  OpenSSL::OpenSSL
   libs-poco-Foundation
 )
 target_sources(libs-poco-Crypto PRIVATE
diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt
index 0b01f82e06..0734c62513 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
 add_library(libs-poco-Foundation)
 target_include_directories(libs-poco-Foundation PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/include
@@ -14,7 +12,6 @@ target_link_libraries(libs-poco-Foundation PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-double-conversion
   contrib-libs-pcre
-  ZLIB::ZLIB
 )
 target_sources(libs-poco-Foundation PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/src/ASCIIEncoding.cpp
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
index c5871b5325..a8d504c02a 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(libs-poco-NetSSL_OpenSSL)
 target_include_directories(libs-poco-NetSSL_OpenSSL PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/libs/poco/NetSSL_OpenSSL/include
@@ -14,7 +12,6 @@ target_include_directories(libs-poco-NetSSL_OpenSSL PRIVATE
 )
 target_link_libraries(libs-poco-NetSSL_OpenSSL PUBLIC
   contrib-libs-cxxsupp
-  OpenSSL::OpenSSL
   libs-poco-Crypto
   libs-poco-Foundation
   libs-poco-JSON
diff --git a/contrib/libs/protobuf/CMakeLists.txt b/contrib/libs/protobuf/CMakeLists.txt
index 088915599e..afa8e20ad2 100644
--- a/contrib/libs/protobuf/CMakeLists.txt
+++ b/contrib/libs/protobuf/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
 add_library(contrib-libs-protobuf)
 target_compile_options(contrib-libs-protobuf PRIVATE
   -DHAVE_CONFIG_H
@@ -15,7 +13,6 @@ target_include_directories(contrib-libs-protobuf PRIVATE
 target_link_libraries(contrib-libs-protobuf PUBLIC
   contrib-libs-cxxsupp
   yutil
-  ZLIB::ZLIB
 )
 target_sources(contrib-libs-protobuf PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src/google/protobuf/any.cc
diff --git a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
index edd4356947..25e35d480d 100644
--- a/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
+++ b/contrib/restricted/aws/aws-c-cal/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(restricted-aws-aws-c-cal)
 target_include_directories(restricted-aws-aws-c-cal PUBLIC
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-cal/include
@@ -8,7 +6,6 @@ target_include_directories(restricted-aws-aws-c-cal PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/aws-c-cal/include
 )
 target_link_libraries(restricted-aws-aws-c-cal PUBLIC
-  OpenSSL::OpenSSL
   restricted-aws-aws-c-common
 )
 target_sources(restricted-aws-aws-c-cal PRIVATE
diff --git a/contrib/restricted/aws/s2n/CMakeLists.txt b/contrib/restricted/aws/s2n/CMakeLists.txt
index 0f08a248a1..3ca96f1fa5 100644
--- a/contrib/restricted/aws/s2n/CMakeLists.txt
+++ b/contrib/restricted/aws/s2n/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(OpenSSL)
-
 add_library(restricted-aws-s2n)
 target_compile_options(restricted-aws-s2n PRIVATE
   -DS2N_ADX
@@ -16,9 +14,6 @@ target_include_directories(restricted-aws-s2n PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/api
 )
-target_link_libraries(restricted-aws-s2n PUBLIC
-  OpenSSL::OpenSSL
-)
 target_sources(restricted-aws-s2n PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/pq-crypto/sike_r2/sikep434r2_fp_x64_asm.S
   ${CMAKE_SOURCE_DIR}/contrib/restricted/aws/s2n/crypto/s2n_aead_cipher_aes_gcm.c
diff --git a/contrib/restricted/boost/libs/iostreams/CMakeLists.txt b/contrib/restricted/boost/libs/iostreams/CMakeLists.txt
index 05485b9396..4ae3afb44e 100644
--- a/contrib/restricted/boost/libs/iostreams/CMakeLists.txt
+++ b/contrib/restricted/boost/libs/iostreams/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(ZLIB)
-
 add_library(boost-libs-iostreams)
 target_compile_options(boost-libs-iostreams PRIVATE
   -DBOOST_ATOMIC_STATIC_LINK=1
@@ -28,7 +26,6 @@ target_include_directories(boost-libs-iostreams PRIVATE
 target_link_libraries(boost-libs-iostreams PUBLIC
   contrib-libs-cxxsupp
   contrib-restricted-boost
-  ZLIB::ZLIB
   contrib-libs-libbz2
 )
 target_sources(boost-libs-iostreams PRIVATE
diff --git a/contrib/restricted/thrift/CMakeLists.txt b/contrib/restricted/thrift/CMakeLists.txt
index 1a51a52d12..fa73aad4ac 100644
--- a/contrib/restricted/thrift/CMakeLists.txt
+++ b/contrib/restricted/thrift/CMakeLists.txt
@@ -1,6 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-
 add_library(contrib-restricted-thrift)
 target_compile_options(contrib-restricted-thrift PRIVATE
   -Wno-deprecated-declarations
@@ -18,8 +15,6 @@ target_include_directories(contrib-restricted-thrift PRIVATE
 target_link_libraries(contrib-restricted-thrift PUBLIC
   contrib-libs-cxxsupp
   contrib-libs-libevent
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
   contrib-restricted-boost
   boost-libs-system
   boost-libs-thread
diff --git a/contrib/tools/python3/src/Modules/CMakeLists.txt b/contrib/tools/python3/src/Modules/CMakeLists.txt
index e179872773..769412d6f7 100644
--- a/contrib/tools/python3/src/Modules/CMakeLists.txt
+++ b/contrib/tools/python3/src/Modules/CMakeLists.txt
@@ -1,6 +1,3 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-
 add_library(python3-src-Modules)
 target_compile_options(python3-src-Modules PRIVATE
   -DPy_BUILD_CORE_MODULE
@@ -20,8 +17,6 @@ target_include_directories(python3-src-Modules PRIVATE
 target_link_libraries(python3-src-Modules PUBLIC
   contrib-libs-expat
   contrib-libs-libbz2
-  OpenSSL::OpenSSL
-  ZLIB::ZLIB
   libs-xz-liblzma
   contrib-restricted-libffi
 )