diff options
author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-24 11:43:00 +0300 |
---|---|---|
committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-02-24 11:43:00 +0300 |
commit | 42f6e0ffddb92ca389ac4bcd01acb0caa905c6df (patch) | |
tree | 6686ff11d0f47de24bfd487d00002ea3fb732490 /contrib/libs | |
parent | ae944dbe1a985556fe224f49a2b1ea85147a07fe (diff) | |
download | ydb-42f6e0ffddb92ca389ac4bcd01acb0caa905c6df.tar.gz |
intermediate changes
ref:fb678b285db60965c2b65db96852ae4cfb5879d6
Diffstat (limited to 'contrib/libs')
-rw-r--r-- | contrib/libs/apache/arrow/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/apache/orc/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/curl/CMakeLists.txt | 7 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/openmp/ya.make | 3 | ||||
-rw-r--r-- | contrib/libs/grpc/grpc++/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/grpc/grpc/CMakeLists.txt | 7 | ||||
-rw-r--r-- | contrib/libs/hdr_histogram/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/jwt-cpp/CMakeLists.txt | 5 | ||||
-rw-r--r-- | contrib/libs/libevent/event_openssl/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/libxml/CMakeLists.txt | 5 | ||||
-rw-r--r-- | contrib/libs/llvm12/lib/Support/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/poco/Crypto/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/poco/Foundation/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/protobuf/CMakeLists.txt | 4 |
16 files changed, 60 insertions, 1 deletions
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt index 20f336f42f..aa40b3dd92 100644 --- a/contrib/libs/apache/arrow/CMakeLists.txt +++ b/contrib/libs/apache/arrow/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(ZLIB) + add_library(libs-apache-arrow) target_compile_options(libs-apache-arrow PUBLIC -DARROW_STATIC @@ -45,6 +47,7 @@ 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 70e9663c6d..2daf3c5578 100644 --- a/contrib/libs/apache/orc/CMakeLists.txt +++ b/contrib/libs/apache/orc/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(ZLIB) + add_library(libs-apache-orc) target_include_directories(libs-apache-orc PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/apache/orc/c++/include @@ -10,6 +12,7 @@ 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 8f7e164364..a54f538057 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,3 +1,5 @@ +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 @@ -30,6 +32,7 @@ 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 8a91f84ab6..9288e61ad4 100644 --- a/contrib/libs/curl/CMakeLists.txt +++ b/contrib/libs/curl/CMakeLists.txt @@ -1,3 +1,7 @@ +find_package(OpenSSL) +find_package(ZLIB) +find_package(c-ares) + add_library(contrib-libs-curl) target_compile_options(contrib-libs-curl PUBLIC -DCURL_STATICLIB @@ -17,7 +21,10 @@ 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/cxxsupp/openmp/ya.make b/contrib/libs/cxxsupp/openmp/ya.make index 9d58259012..62706f5813 100644 --- a/contrib/libs/cxxsupp/openmp/ya.make +++ b/contrib/libs/cxxsupp/openmp/ya.make @@ -34,9 +34,10 @@ NO_UTIL() CFLAGS( -fno-exceptions - -fno-lto ) +SET_APPEND(CFLAGS -fno-lto) + COMPILE_C_AS_CXX() IF (SANITIZER_TYPE == thread) diff --git a/contrib/libs/grpc/grpc++/CMakeLists.txt b/contrib/libs/grpc/grpc++/CMakeLists.txt index 61448e63f9..5d05e9fc9d 100644 --- a/contrib/libs/grpc/grpc++/CMakeLists.txt +++ b/contrib/libs/grpc/grpc++/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(OpenSSL) + add_library(libs-grpc-grpc++) target_compile_options(libs-grpc-grpc++ PRIVATE -DGRPC_POSIX_FORK_ALLOW_PTHREAD_ATFORK=1 @@ -19,6 +21,7 @@ target_link_libraries(libs-grpc-grpc++ PUBLIC src-core-lib grpc-third_party-address_sorting grpc-third_party-upb + OpenSSL::OpenSSL yabseil-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 828de1181b..4c4397f64d 100644 --- a/contrib/libs/grpc/grpc/CMakeLists.txt +++ b/contrib/libs/grpc/grpc/CMakeLists.txt @@ -1,3 +1,7 @@ +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 @@ -19,10 +23,13 @@ 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 yabseil-cpp-tstring-y_absl-hash abseil-cpp-tstring-y_absl-meta yabseil-cpp-tstring-y_absl-status diff --git a/contrib/libs/hdr_histogram/CMakeLists.txt b/contrib/libs/hdr_histogram/CMakeLists.txt index 0e51bb8fab..2d987779e8 100644 --- a/contrib/libs/hdr_histogram/CMakeLists.txt +++ b/contrib/libs/hdr_histogram/CMakeLists.txt @@ -1,9 +1,12 @@ +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 6b742d5a5b..12571feb65 100644 --- a/contrib/libs/jwt-cpp/CMakeLists.txt +++ b/contrib/libs/jwt-cpp/CMakeLists.txt @@ -1 +1,6 @@ +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/libevent/event_openssl/CMakeLists.txt b/contrib/libs/libevent/event_openssl/CMakeLists.txt index 153d58e7b0..976898ab8c 100644 --- a/contrib/libs/libevent/event_openssl/CMakeLists.txt +++ b/contrib/libs/libevent/event_openssl/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(OpenSSL) + add_library(libs-libevent-event_openssl) target_compile_options(libs-libevent-event_openssl PRIVATE -DHAVE_CONFIG_H @@ -9,6 +11,7 @@ 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 48c2a900d7..3efc791fbe 100644 --- a/contrib/libs/libxml/CMakeLists.txt +++ b/contrib/libs/libxml/CMakeLists.txt @@ -1,3 +1,6 @@ +find_package(Iconv) +find_package(ZLIB) + add_library(contrib-libs-libxml) target_compile_options(contrib-libs-libxml PUBLIC -DLIBXML_STATIC @@ -16,6 +19,8 @@ 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 7f33557b1f..d45fe3341b 100644 --- a/contrib/libs/llvm12/lib/Support/CMakeLists.txt +++ b/contrib/libs/llvm12/lib/Support/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(ZLIB) + add_library(llvm12-lib-Support) target_include_directories(llvm12-lib-Support PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/llvm12/lib/Support @@ -6,6 +8,7 @@ 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 eeefc74efc..39f64a1c98 100644 --- a/contrib/libs/poco/Crypto/CMakeLists.txt +++ b/contrib/libs/poco/Crypto/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(OpenSSL) + add_library(libs-poco-Crypto) target_include_directories(libs-poco-Crypto PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Crypto/include @@ -9,6 +11,7 @@ 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 0734c62513..0b01f82e06 100644 --- a/contrib/libs/poco/Foundation/CMakeLists.txt +++ b/contrib/libs/poco/Foundation/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(ZLIB) + add_library(libs-poco-Foundation) target_include_directories(libs-poco-Foundation PUBLIC ${CMAKE_SOURCE_DIR}/contrib/libs/poco/Foundation/include @@ -12,6 +14,7 @@ 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 a8d504c02a..c5871b5325 100644 --- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt +++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt @@ -1,3 +1,5 @@ +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 @@ -12,6 +14,7 @@ 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 4e1700bfd0..e9a4fd025e 100644 --- a/contrib/libs/protobuf/CMakeLists.txt +++ b/contrib/libs/protobuf/CMakeLists.txt @@ -1,3 +1,5 @@ +find_package(ZLIB) + add_library(contrib-libs-protobuf) target_compile_options(contrib-libs-protobuf PRIVATE -DHAVE_CONFIG_H @@ -13,6 +15,7 @@ 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 @@ -113,6 +116,7 @@ target_include_directories(contrib-libs-protobuf.global PRIVATE target_link_libraries(contrib-libs-protobuf.global PUBLIC contrib-libs-cxxsupp yutil + ZLIB::ZLIB ) target_sources(contrib-libs-protobuf.global PRIVATE ${CMAKE_SOURCE_DIR}/contrib/libs/protobuf/src/google/protobuf/generated_message_util.cc |