aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs
diff options
context:
space:
mode:
authorarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-24 17:52:14 +0300
committerarcadia-devtools <arcadia-devtools@yandex-team.ru>2022-02-24 17:52:14 +0300
commit154700b20366969d89b7f6b6ffcedf6be3a1deae (patch)
tree84c3ecf3cb6ca91983676fe6b79f0904d66a9462 /contrib/libs
parente593c74c608a3cd3ec6189c63ec44ed28616340e (diff)
downloadydb-154700b20366969d89b7f6b6ffcedf6be3a1deae.tar.gz
intermediate changes
ref:70ac1bca1acbb458c863fb4686263967ea009057
Diffstat (limited to 'contrib/libs')
-rw-r--r--contrib/libs/apache/arrow/CMakeLists.txt2
-rw-r--r--contrib/libs/apache/orc/CMakeLists.txt2
-rw-r--r--contrib/libs/aws-sdk-cpp/aws-cpp-sdk-core/CMakeLists.txt2
-rw-r--r--contrib/libs/curl/CMakeLists.txt6
-rw-r--r--contrib/libs/grpc/grpc++/CMakeLists.txt2
-rw-r--r--contrib/libs/grpc/grpc/CMakeLists.txt6
-rw-r--r--contrib/libs/hdr_histogram/CMakeLists.txt2
-rw-r--r--contrib/libs/jwt-cpp/CMakeLists.txt2
-rw-r--r--contrib/libs/libevent/event_openssl/CMakeLists.txt2
-rw-r--r--contrib/libs/libxml/CMakeLists.txt4
-rw-r--r--contrib/libs/llvm12/lib/Support/CMakeLists.txt2
-rw-r--r--contrib/libs/poco/Crypto/CMakeLists.txt2
-rw-r--r--contrib/libs/poco/Foundation/CMakeLists.txt2
-rw-r--r--contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt2
-rw-r--r--contrib/libs/protobuf/CMakeLists.txt2
-rw-r--r--contrib/libs/re2/re2/re2.cc2
-rw-r--r--contrib/libs/re2/re2/re2.h14
-rw-r--r--contrib/libs/re2/re2/stringpiece.h4
18 files changed, 20 insertions, 40 deletions
diff --git a/contrib/libs/apache/arrow/CMakeLists.txt b/contrib/libs/apache/arrow/CMakeLists.txt
index aa40b3dd92..fc5752c54a 100644
--- a/contrib/libs/apache/arrow/CMakeLists.txt
+++ b/contrib/libs/apache/arrow/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
add_library(libs-apache-arrow)
target_compile_options(libs-apache-arrow PUBLIC
diff --git a/contrib/libs/apache/orc/CMakeLists.txt b/contrib/libs/apache/orc/CMakeLists.txt
index 2daf3c5578..3dea41a2dc 100644
--- a/contrib/libs/apache/orc/CMakeLists.txt
+++ b/contrib/libs/apache/orc/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
add_library(libs-apache-orc)
target_include_directories(libs-apache-orc PRIVATE
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..4fc6248ad8 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,4 +1,4 @@
-find_package(OpenSSL)
+find_package(OpenSSL REQUIRED)
add_library(libs-aws-sdk-cpp-aws-cpp-sdk-core)
target_compile_options(libs-aws-sdk-cpp-aws-cpp-sdk-core PRIVATE
diff --git a/contrib/libs/curl/CMakeLists.txt b/contrib/libs/curl/CMakeLists.txt
index 9288e61ad4..2fd5f95bd6 100644
--- a/contrib/libs/curl/CMakeLists.txt
+++ b/contrib/libs/curl/CMakeLists.txt
@@ -1,6 +1,6 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-find_package(c-ares)
+find_package(OpenSSL REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(c-ares REQUIRED)
add_library(contrib-libs-curl)
target_compile_options(contrib-libs-curl PUBLIC
diff --git a/contrib/libs/grpc/grpc++/CMakeLists.txt b/contrib/libs/grpc/grpc++/CMakeLists.txt
index 5d05e9fc9d..37e39a7620 100644
--- a/contrib/libs/grpc/grpc++/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc++/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenSSL)
+find_package(OpenSSL REQUIRED)
add_library(libs-grpc-grpc++)
target_compile_options(libs-grpc-grpc++ PRIVATE
diff --git a/contrib/libs/grpc/grpc/CMakeLists.txt b/contrib/libs/grpc/grpc/CMakeLists.txt
index 4c4397f64d..600ce41b22 100644
--- a/contrib/libs/grpc/grpc/CMakeLists.txt
+++ b/contrib/libs/grpc/grpc/CMakeLists.txt
@@ -1,6 +1,6 @@
-find_package(OpenSSL)
-find_package(ZLIB)
-find_package(c-ares)
+find_package(OpenSSL REQUIRED)
+find_package(ZLIB REQUIRED)
+find_package(c-ares REQUIRED)
add_library(libs-grpc-grpc)
target_compile_options(libs-grpc-grpc PRIVATE
diff --git a/contrib/libs/hdr_histogram/CMakeLists.txt b/contrib/libs/hdr_histogram/CMakeLists.txt
index 2d987779e8..a6feec3595 100644
--- a/contrib/libs/hdr_histogram/CMakeLists.txt
+++ b/contrib/libs/hdr_histogram/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
add_library(contrib-libs-hdr_histogram)
target_include_directories(contrib-libs-hdr_histogram PRIVATE
diff --git a/contrib/libs/jwt-cpp/CMakeLists.txt b/contrib/libs/jwt-cpp/CMakeLists.txt
index 12571feb65..89bb5317ad 100644
--- a/contrib/libs/jwt-cpp/CMakeLists.txt
+++ b/contrib/libs/jwt-cpp/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenSSL)
+find_package(OpenSSL REQUIRED)
add_library(contrib-libs-jwt-cpp INTERFACE)
target_link_libraries(contrib-libs-jwt-cpp INTERFACE
diff --git a/contrib/libs/libevent/event_openssl/CMakeLists.txt b/contrib/libs/libevent/event_openssl/CMakeLists.txt
index 976898ab8c..7d41a791ff 100644
--- a/contrib/libs/libevent/event_openssl/CMakeLists.txt
+++ b/contrib/libs/libevent/event_openssl/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenSSL)
+find_package(OpenSSL REQUIRED)
add_library(libs-libevent-event_openssl)
target_compile_options(libs-libevent-event_openssl PRIVATE
diff --git a/contrib/libs/libxml/CMakeLists.txt b/contrib/libs/libxml/CMakeLists.txt
index 3efc791fbe..b678a95771 100644
--- a/contrib/libs/libxml/CMakeLists.txt
+++ b/contrib/libs/libxml/CMakeLists.txt
@@ -1,5 +1,5 @@
-find_package(Iconv)
-find_package(ZLIB)
+find_package(Iconv REQUIRED)
+find_package(ZLIB REQUIRED)
add_library(contrib-libs-libxml)
target_compile_options(contrib-libs-libxml PUBLIC
diff --git a/contrib/libs/llvm12/lib/Support/CMakeLists.txt b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
index d45fe3341b..fb3119479a 100644
--- a/contrib/libs/llvm12/lib/Support/CMakeLists.txt
+++ b/contrib/libs/llvm12/lib/Support/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
add_library(llvm12-lib-Support)
target_include_directories(llvm12-lib-Support PRIVATE
diff --git a/contrib/libs/poco/Crypto/CMakeLists.txt b/contrib/libs/poco/Crypto/CMakeLists.txt
index 39f64a1c98..eaeebeaab3 100644
--- a/contrib/libs/poco/Crypto/CMakeLists.txt
+++ b/contrib/libs/poco/Crypto/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenSSL)
+find_package(OpenSSL REQUIRED)
add_library(libs-poco-Crypto)
target_include_directories(libs-poco-Crypto PUBLIC
diff --git a/contrib/libs/poco/Foundation/CMakeLists.txt b/contrib/libs/poco/Foundation/CMakeLists.txt
index 0b01f82e06..6622570f2d 100644
--- a/contrib/libs/poco/Foundation/CMakeLists.txt
+++ b/contrib/libs/poco/Foundation/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
add_library(libs-poco-Foundation)
target_include_directories(libs-poco-Foundation PUBLIC
diff --git a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
index c5871b5325..3f163027d2 100644
--- a/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
+++ b/contrib/libs/poco/NetSSL_OpenSSL/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(OpenSSL)
+find_package(OpenSSL REQUIRED)
add_library(libs-poco-NetSSL_OpenSSL)
target_include_directories(libs-poco-NetSSL_OpenSSL PUBLIC
diff --git a/contrib/libs/protobuf/CMakeLists.txt b/contrib/libs/protobuf/CMakeLists.txt
index e9a4fd025e..2494eba896 100644
--- a/contrib/libs/protobuf/CMakeLists.txt
+++ b/contrib/libs/protobuf/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package(ZLIB)
+find_package(ZLIB REQUIRED)
add_library(contrib-libs-protobuf)
target_compile_options(contrib-libs-protobuf PRIVATE
diff --git a/contrib/libs/re2/re2/re2.cc b/contrib/libs/re2/re2/re2.cc
index 47fb385e4e..ad126d00bd 100644
--- a/contrib/libs/re2/re2/re2.cc
+++ b/contrib/libs/re2/re2/re2.cc
@@ -1050,14 +1050,12 @@ bool Parse(const char* str, size_t n, std::string* dest) {
return true;
}
-#if defined(ARCADIA_ROOT)
template <>
bool Parse(const char* str, size_t n, TString* dest) {
if (dest == NULL) return true;
dest->assign(str, n);
return true;
}
-#endif
template <>
bool Parse(const char* str, size_t n, StringPiece* dest) {
diff --git a/contrib/libs/re2/re2/re2.h b/contrib/libs/re2/re2/re2.h
index f8f8043daf..c9694d35ac 100644
--- a/contrib/libs/re2/re2/re2.h
+++ b/contrib/libs/re2/re2/re2.h
@@ -210,9 +210,7 @@
#include <string>
#include <type_traits>
#include <vector>
-#if defined(ARCADIA_ROOT)
#include <util/generic/string.h>
-#endif
#if defined(__APPLE__)
#include <TargetConditionals.h>
@@ -283,10 +281,8 @@ class RE2 {
#endif
RE2(const StringPiece& pattern);
RE2(const StringPiece& pattern, const Options& options);
-#if defined(ARCADIA_ROOT)
// ambiguity resolution.
RE2(const TString& pattern) : RE2(StringPiece(pattern)) {}
-#endif
~RE2();
// Returns whether RE2 was created properly.
@@ -464,7 +460,6 @@ class RE2 {
static bool Replace(std::string* str,
const RE2& re,
const StringPiece& rewrite);
-#if defined(ARCADIA_ROOT)
static bool Replace(TString *str,
const RE2& pattern,
const StringPiece& rewrite) {
@@ -473,7 +468,6 @@ class RE2 {
*str = tmp;
return res;
}
-#endif
// Like Replace(), except replaces successive non-overlapping occurrences
// of the pattern in the string with the rewrite. E.g.
@@ -492,7 +486,6 @@ class RE2 {
const RE2& re,
const StringPiece& rewrite);
-#if defined(ARCADIA_ROOT)
static int GlobalReplace(TString* str,
const RE2& pattern,
const StringPiece& rewrite) {
@@ -501,7 +494,6 @@ class RE2 {
*str = tmp;
return res;
}
-#endif
// Like Replace, except that if the pattern matches, "rewrite"
// is copied into "out" with substitutions. The non-matching
@@ -516,7 +508,6 @@ class RE2 {
const StringPiece& rewrite,
std::string* out);
-#if defined(ARCADIA_ROOT)
static bool Extract(const StringPiece& text,
const RE2& pattern,
const StringPiece& rewrite,
@@ -526,7 +517,6 @@ class RE2 {
*out = tmp;
return res;
}
-#endif
// Escapes all potentially meaningful regexp characters in
// 'unquoted'. The returned string, used as a regular expression,
@@ -621,7 +611,6 @@ class RE2 {
return CheckRewriteString(rewrite, static_cast<std::string*>(error));
}
-#if defined(ARCADIA_ROOT)
bool CheckRewriteString(const StringPiece& rewrite, TString* error) const {
if (error) {
std::string tmp;
@@ -632,7 +621,6 @@ class RE2 {
return CheckRewriteString(rewrite, nullptr);
}
}
-#endif
// Returns the maximum submatch needed for the rewrite to be done by
// Replace(). E.g. if rewrite == "foo \\2,\\1", returns 2.
@@ -847,9 +835,7 @@ template <typename T> struct Parse3ary : public std::false_type {};
template <> struct Parse3ary<void> : public std::true_type {};
template <> struct Parse3ary<std::string> : public std::true_type {};
template <> struct Parse3ary<StringPiece> : public std::true_type {};
-#if defined(ARCADIA_ROOT)
template <> struct Parse3ary<TString> : public std::true_type {};
-#endif
template <> struct Parse3ary<char> : public std::true_type {};
template <> struct Parse3ary<signed char> : public std::true_type {};
template <> struct Parse3ary<unsigned char> : public std::true_type {};
diff --git a/contrib/libs/re2/re2/stringpiece.h b/contrib/libs/re2/re2/stringpiece.h
index ef73683401..ef7cef99e6 100644
--- a/contrib/libs/re2/re2/stringpiece.h
+++ b/contrib/libs/re2/re2/stringpiece.h
@@ -33,9 +33,7 @@
#if __has_include(<string_view>) && __cplusplus >= 201703L
#include <string_view>
#endif
-#if defined(ARCADIA_ROOT)
#include <util/generic/string.h>
-#endif
namespace re2 {
@@ -70,10 +68,8 @@ class StringPiece {
: data_(str), size_(str == NULL ? 0 : strlen(str)) {}
StringPiece(const char* str, size_type len)
: data_(str), size_(len) {}
-#if defined(ARCADIA_ROOT)
StringPiece(const TString& str)
: StringPiece(str.data(), str.size()) {}
-#endif
const_iterator begin() const { return data_; }
const_iterator end() const { return data_ + size_; }