diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2024-10-20 02:02:15 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2024-10-20 02:20:15 +0300 |
| commit | 46c2b8bb6a43373de130422b6c7567a022e45ee5 (patch) | |
| tree | 5a6ba36bd149f6f07e0ec4373f21c34fb88e48d7 /contrib | |
| parent | 6378cb156ead0e2eedc675b8e2e37769bf86bb46 (diff) | |
| download | ydb-46c2b8bb6a43373de130422b6c7567a022e45ee5.tar.gz | |
Intermediate changes
commit_hash:eddaace1b99679850506a2fe1993b3e0be396422
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/protobuf/.yandex_meta/__init__.py | 4 | ||||
| -rw-r--r-- | contrib/tools/m4/.yandex_meta/__init__.py | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/contrib/libs/protobuf/.yandex_meta/__init__.py b/contrib/libs/protobuf/.yandex_meta/__init__.py index a61afd98f1..7d7498e483 100644 --- a/contrib/libs/protobuf/.yandex_meta/__init__.py +++ b/contrib/libs/protobuf/.yandex_meta/__init__.py @@ -147,12 +147,14 @@ ENDIF() libprotobuf.RECURSE = ["builtin_proto"] libprotobuf.PEERDIR.add("library/cpp/sanitizer/include") - + # Dont use full y_absl library + # fmt: off libprotobuf.PEERDIR = set([ lib for lib in libprotobuf.PEERDIR if 'abseil-cpp-tstring' not in lib ]) + # fmt: on libprotobuf.PEERDIR.add("contrib/restricted/abseil-cpp-tstring/y_absl/status") libprotobuf.PEERDIR.add("contrib/restricted/abseil-cpp-tstring/y_absl/log") diff --git a/contrib/tools/m4/.yandex_meta/__init__.py b/contrib/tools/m4/.yandex_meta/__init__.py index db1c36fe9a..30774a6ae0 100644 --- a/contrib/tools/m4/.yandex_meta/__init__.py +++ b/contrib/tools/m4/.yandex_meta/__init__.py @@ -109,6 +109,7 @@ m4 = NixProject( "cat", "sed", ], + # fmt: off copy_sources=[ # these are included from regex.c and should not be added into SRCS "lib/regcomp.c", @@ -116,6 +117,7 @@ m4 = NixProject( "lib/regex_internal.h", "lib/regexec.c", ] + [f"lib/{src}" for src in itertools.chain(WINDOWS_SRCS, DARWIN_SRCS)], + # fmt: on use_full_libnames=True, install_targets=[ "libm4", @@ -166,4 +168,3 @@ m4.copy_top_sources_except |= { "ChangeLog", "ChangeLog-2014", } - |