aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorsnermolaev <snermolaev@yandex-team.com>2024-04-01 14:00:44 +0300
committersnermolaev <snermolaev@yandex-team.com>2024-04-01 14:13:18 +0300
commita9ec598a440cf8fbb27a9a71cce70a8631510106 (patch)
treecab9ea6190a6aa53fea1f19f3b439c0f1caa2404 /contrib
parent038ec6662d49ba5f106237929622506be53f85b0 (diff)
downloadydb-a9ec598a440cf8fbb27a9a71cce70a8631510106.tar.gz
revert rXXXXXX, rXXXXXX
Revert "Control of exporting with system STL/vanilla protoc/linux-headers/openSSL by ymake.core.conf" This reverts commit eb123654ae6ebb82ad676dd1fdcd866e27ee1d88, reversing changes made to 8177a333abcef7ed90ff110a9c7591be4828de64. Revert "YT-19191: Rename flag NO_CUSTOM_CHAR_PTR_STD_COMPARATOR in build configs" This reverts commit 37eff4e1f8d8316d90e9d97fd69353bd1476a41f, reversing changes made to 3d5d96d24fb40eb0373254617c250e1f2ad41a47. 85b8629ed139a675adfba85b85a44e759b1553c7
Diffstat (limited to 'contrib')
-rw-r--r--contrib/libs/linux-headers/ya.make22
-rw-r--r--contrib/libs/openssl/crypto/ya.make14
-rw-r--r--contrib/libs/openssl/ya.make21
-rw-r--r--contrib/libs/protobuf/ya.make24
-rw-r--r--contrib/libs/protoc/ya.make20
5 files changed, 31 insertions, 70 deletions
diff --git a/contrib/libs/linux-headers/ya.make b/contrib/libs/linux-headers/ya.make
index af40e65a2f..dcaf1a8101 100644
--- a/contrib/libs/linux-headers/ya.make
+++ b/contrib/libs/linux-headers/ya.make
@@ -30,27 +30,15 @@ VERSION(6.5.9)
ORIGINAL_SOURCE(mirror://kernel/linux/kernel/v6.x/linux-6.5.9.tar.xz)
-IF (OPENSOURCE_REPLACE_LINUX_HEADERS)
-
- OPENSOURCE_EXPORT_REPLACEMENT(
- CMAKE linux-headers-generic
- CMAKE_TARGET linux-headers-generic::linux-headers-generic
- CONAN linux-headers-generic/${OPENSOURCE_REPLACE_LINUX_HEADERS}
- )
-
-ELSE() # IF (OPENSOURCE_REPLACE_LINUX_HEADERS)
-
- ADDINCL(
- GLOBAL contrib/libs/linux-headers
- GLOBAL contrib/libs/linux-headers/_nf
- )
-
-ENDIF() # ELSE() # IF (OPENSOURCE_REPLACE_LINUX_HEADERS)
-
DISABLE(NEED_PLATFORM_PEERDIRS)
DISABLE(WITH_VALGRIND)
+ADDINCL(
+ GLOBAL contrib/libs/linux-headers
+ GLOBAL contrib/libs/linux-headers/_nf
+)
+
NO_PLATFORM()
END()
diff --git a/contrib/libs/openssl/crypto/ya.make b/contrib/libs/openssl/crypto/ya.make
index c6e9d82018..be3f2b7328 100644
--- a/contrib/libs/openssl/crypto/ya.make
+++ b/contrib/libs/openssl/crypto/ya.make
@@ -13,16 +13,15 @@ LICENSE(
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-IF (OPENSOURCE_REPLACE_OPENSSL)
-
+# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration
+IF (OPENSOURCE_PROJECT == "catboost")
OPENSOURCE_EXPORT_REPLACEMENT(
CMAKE OpenSSL
CMAKE_PACKAGE_COMPONENT Crypto
CMAKE_TARGET OpenSSL::Crypto
- CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL}
+ CONAN openssl/1.1.1t
)
-
-ENDIF() # IF (OPENSOURCE_REPLACE_OPENSSL)
+ENDIF()
PEERDIR(
contrib/libs/zlib
@@ -38,7 +37,8 @@ ADDINCL(
contrib/libs/openssl/include
)
-IF (NOT EXPORT_CMAKE OR NOT OPENSOURCE_REPLACE_OPENSSL)
+# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration
+IF (NOT EXPORT_CMAKE OR OPENSOURCE_PROJECT != "catboost")
IF (OS_LINUX)
IF (ARCH_ARM64)
@@ -1362,6 +1362,6 @@ IF (ARCADIA_OPENSSL_DISABLE_ARMV7_TICK)
)
ENDIF()
-ENDIF() # IF (NOT EXPORT_CMAKE OR NOT OPENSOURCE_REPLACE_OPENSSL)
+ENDIF()
END()
diff --git a/contrib/libs/openssl/ya.make b/contrib/libs/openssl/ya.make
index e6c03b5b48..e8d70a9a31 100644
--- a/contrib/libs/openssl/ya.make
+++ b/contrib/libs/openssl/ya.make
@@ -6,21 +6,14 @@ VERSION(1.1.1t)
ORIGINAL_SOURCE(https://github.com/openssl/openssl/archive/OpenSSL_1_1_1t.tar.gz)
-IF (OPENSOURCE_REPLACE_OPENSSL)
-
+# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration
+IF (OPENSOURCE_PROJECT == "catboost")
OPENSOURCE_EXPORT_REPLACEMENT(
CMAKE OpenSSL
CMAKE_TARGET OpenSSL::OpenSSL
- CONAN openssl/${OPENSOURCE_REPLACE_OPENSSL}
- )
-
-ELSE() # IF (OPENSOURCE_REPLACE_OPENSSL)
-
- ADDINCL(
- GLOBAL contrib/libs/openssl/include
+ CONAN openssl/1.1.1t
)
-
-ENDIF() # ELSE() # IF (OPENSOURCE_REPLACE_OPENSSL)
+ENDIF()
LICENSE(
Apache-2.0 AND
@@ -40,10 +33,12 @@ PEERDIR(
)
ADDINCL(
+ GLOBAL contrib/libs/openssl/include
contrib/libs/openssl
)
-IF (NOT EXPORT_CMAKE OR NOT OPENSOURCE_REPLACE_OPENSSL)
+# TODO(YMAKE-92) Move this information out of ya.make and allow per project configuration
+IF (NOT EXPORT_CMAKE OR OPENSOURCE_PROJECT != "catboost")
IF (OS_LINUX)
IF (ARCH_ARM64)
@@ -340,7 +335,7 @@ IF (OS_ANDROID AND ARCH_ARM64)
)
ENDIF()
-ENDIF() # IF (NOT EXPORT_CMAKE OR NOT OPENSOURCE_REPLACE_OPENSSL)
+ENDIF()
END()
diff --git a/contrib/libs/protobuf/ya.make b/contrib/libs/protobuf/ya.make
index 60f012f9ff..258e325959 100644
--- a/contrib/libs/protobuf/ya.make
+++ b/contrib/libs/protobuf/ya.make
@@ -15,28 +15,18 @@ VERSION(3.19.0)
ORIGINAL_SOURCE(https://github.com/protocolbuffers/protobuf/archive/v3.19.0.tar.gz)
-IF (OPENSOURCE_REPLACE_PROTOBUF)
-
- OPENSOURCE_EXPORT_REPLACEMENT(
- CMAKE Protobuf
- CMAKE_TARGET protobuf::libprotobuf protobuf::libprotoc
- CONAN protobuf/${OPENSOURCE_REPLACE_PROTOBUF} "&& conan_require_tool" protobuf/${OPENSOURCE_REPLACE_PROTOBUF} "&& conan_import \"bin, protoc* -> ./bin\" && vanilla_protobuf"
- )
-
-ELSE() # IF (OPENSOURCE_REPLACE_PROTOBUF)
-
- ADDINCL(
- GLOBAL contrib/libs/protobuf/src
- GLOBAL FOR proto contrib/libs/protobuf/src
- )
-
-ENDIF() # ELSE() # IF (OPENSOURCE_REPLACE_PROTOBUF)
-
PEERDIR(
contrib/libs/zlib
library/cpp/sanitizer/include
)
+ADDINCL(
+ GLOBAL contrib/libs/protobuf/src
+ GLOBAL FOR
+ proto
+ contrib/libs/protobuf/src
+)
+
NO_COMPILER_WARNINGS()
CFLAGS(
diff --git a/contrib/libs/protoc/ya.make b/contrib/libs/protoc/ya.make
index a864faf185..f1134013cb 100644
--- a/contrib/libs/protoc/ya.make
+++ b/contrib/libs/protoc/ya.make
@@ -13,28 +13,16 @@ VERSION(3.19.0)
ORIGINAL_SOURCE(https://github.com/protocolbuffers/protobuf/archive/v3.19.0.tar.gz)
-IF (OPENSOURCE_REPLACE_PROTOBUF)
-
- OPENSOURCE_EXPORT_REPLACEMENT(
- CMAKE Protobuf
- CMAKE_TARGET protobuf::libprotobuf protobuf::libprotoc
- CONAN protobuf/${OPENSOURCE_REPLACE_PROTOBUF} "&& conan_require_tool" protobuf/${OPENSOURCE_REPLACE_PROTOBUF} "&& conan_import \"bin, protoc* -> ./bin\" && vanilla_protobuf"
- )
-
-ELSE() # IF (OPENSOURCE_REPLACE_PROTOBUF)
-
- ADDINCL(
- GLOBAL contrib/libs/protoc/src
- )
-
-ENDIF() # ELSE() # IF (OPENSOURCE_REPLACE_PROTOBUF)
-
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
PEERDIR(
contrib/libs/protobuf
)
+ADDINCL(
+ GLOBAL contrib/libs/protoc/src
+)
+
NO_COMPILER_WARNINGS()
NO_UTIL()