diff options
| author | snermolaev <snermolaev@yandex-team.com> | 2024-04-01 14:00:44 +0300 |
|---|---|---|
| committer | snermolaev <snermolaev@yandex-team.com> | 2024-04-01 14:13:18 +0300 |
| commit | a9ec598a440cf8fbb27a9a71cce70a8631510106 (patch) | |
| tree | cab9ea6190a6aa53fea1f19f3b439c0f1caa2404 /contrib/libs/protoc | |
| parent | 038ec6662d49ba5f106237929622506be53f85b0 (diff) | |
| download | ydb-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/libs/protoc')
| -rw-r--r-- | contrib/libs/protoc/ya.make | 20 |
1 files changed, 4 insertions, 16 deletions
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() |