Ydb stable 22-4-2122.4.21

x-stable-origin-commit: e89099581237299a132feafb5b58af59ebd0468a

13 files changed, 32 insertions, 365 deletions

diff --git a/contrib/tools/CMakeLists.txt b/contrib/tools/CMakeLists.txt
new file mode 100644
index 0000000000..07c36cc20d
--- /dev/null
+++ b/contrib/tools/CMakeLists.txt
@@ -0,0 +1,9 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(protoc)
diff --git a/contrib/tools/protoc/CMakeLists.txt b/contrib/tools/protoc/CMakeLists.txt
new file mode 100644
index 0000000000..5b078f6e25
--- /dev/null
+++ b/contrib/tools/protoc/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(bin)
+add_subdirectory(plugins)
diff --git a/contrib/tools/protoc/bin/CMakeLists.txt b/contrib/tools/protoc/bin/CMakeLists.txt
index fc7b1ee73c..dbfe6fa2c4 100644
--- a/contrib/tools/protoc/bin/CMakeLists.txt
+++ b/contrib/tools/protoc/bin/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/tools/protoc/bin/ya.make b/contrib/tools/protoc/bin/ya.make
deleted file mode 100644
index f9e74f5e4c..0000000000
--- a/contrib/tools/protoc/bin/ya.make
+++ /dev/null
@@ -1,26 +0,0 @@
-PROGRAM(protoc)
-
-OWNER(
-    velavokr
-    g:contrib
-    g:cpp-contrib
-)
-
-LICENSE(BSD-3-Clause)
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    contrib/libs/protoc
-)
-SRCDIR(
-    contrib/libs/protoc
-)
-
-SRCS(
-    src/google/protobuf/compiler/main.cc
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/protoc/plugins/CMakeLists.txt b/contrib/tools/protoc/plugins/CMakeLists.txt
new file mode 100644
index 0000000000..27af5d725b
--- /dev/null
+++ b/contrib/tools/protoc/plugins/CMakeLists.txt
@@ -0,0 +1,10 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(cpp_styleguide)
+add_subdirectory(grpc_cpp)
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
index fc7b1ee73c..dbfe6fa2c4 100644
--- a/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/cpp_styleguide/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make b/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
deleted file mode 100644
index e8f7558208..0000000000
--- a/contrib/tools/protoc/plugins/cpp_styleguide/bin/ya.make
+++ /dev/null
@@ -1,21 +0,0 @@
-OWNER(g:contrib)
-
-PROGRAM(cpp_styleguide)
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    contrib/libs/protoc
-)
-
-SRCS(
-    cpp_styleguide.cpp
-)
-
-SRCDIR(
-    contrib/tools/protoc/plugins/cpp_styleguide
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/cpp_styleguide/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
index fc7b1ee73c..dbfe6fa2c4 100644
--- a/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
+++ b/contrib/tools/protoc/plugins/grpc_cpp/CMakeLists.txt
@@ -8,6 +8,6 @@
 
 if (APPLE)
   include(CMakeLists.darwin.txt)
-elseif (UNIX AND NOT APPLE)
+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND NOT APPLE)
   include(CMakeLists.linux.txt)
 endif()
diff --git a/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make b/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
deleted file mode 100644
index f2181ce63a..0000000000
--- a/contrib/tools/protoc/plugins/grpc_cpp/bin/ya.make
+++ /dev/null
@@ -1,30 +0,0 @@
-OWNER(akastornov g:contrib g:cpp-contrib)
-
-PROGRAM(grpc_cpp)
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/libs/grpc/src/compiler/grpc_plugin_support
-)
-
-ADDINCL(
-    contrib/libs/grpc
-    contrib/libs/grpc/include
-)
-
-NO_COMPILER_WARNINGS()
-
-CFLAGS(
-    -DGRPC_USE_ABSL=0
-)
-
-SRCDIR(contrib/libs/grpc/src/compiler)
-
-SRCS(
-    cpp_plugin.cc
-)
-
-INCLUDE(${ARCADIA_ROOT}/build/prebuilt/contrib/tools/protoc/plugins/grpc_cpp/ya.make.induced_deps)
-
-END()
diff --git a/contrib/tools/protoc/plugins/grpc_java/bin/ya.make b/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
deleted file mode 100644
index b5da57408c..0000000000
--- a/contrib/tools/protoc/plugins/grpc_java/bin/ya.make
+++ /dev/null
@@ -1,21 +0,0 @@
-OWNER(
-    akastornov
-    g:contrib
-)
-
-PROGRAM(grpc_java)
-
-NO_COMPILER_WARNINGS()
-
-PEERDIR(
-    contrib/libs/protoc
-)
-
-SRCDIR(contrib/libs/grpc-java/compiler/src/java_plugin/cpp)
-
-SRCS(
-    java_plugin.cpp
-    java_generator.cpp
-)
-
-END()
diff --git a/contrib/tools/protoc/plugins/grpc_python/bin/ya.make b/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
deleted file mode 100644
index bd0f6a3b48..0000000000
--- a/contrib/tools/protoc/plugins/grpc_python/bin/ya.make
+++ /dev/null
@@ -1,28 +0,0 @@
-OWNER(akastornov g:contrib g:cpp-contrib)
-
-PROGRAM(grpc_python)
-
-LICENSE(Apache-2.0)
-
-PEERDIR(
-    contrib/libs/grpc/src/compiler/grpc_plugin_support
-)
-
-ADDINCL(
-    contrib/libs/grpc
-    contrib/libs/grpc/include
-)
-
-NO_COMPILER_WARNINGS()
-
-CFLAGS(
-    -DGRPC_USE_ABSL=0
-)
-
-SRCDIR(contrib/libs/grpc/src/compiler)
-
-SRCS(
-    python_plugin.cc
-)
-
-END()
diff --git a/contrib/tools/ragel6/bin/ya.make b/contrib/tools/ragel6/bin/ya.make
deleted file mode 100644
index 3adf88c56b..0000000000
--- a/contrib/tools/ragel6/bin/ya.make
+++ /dev/null
@@ -1,116 +0,0 @@
-OWNER(pg g:cpp-contrib)
-
-PROGRAM(ragel6)
-
-VERSION(6.10)
-
-LICENSE(GPL-2.0)
-
-PEERDIR(
-    contrib/tools/ragel5/aapl
-)
-
-ADDINCL(
-    contrib/tools/ragel6
-)
-
-NO_COMPILER_WARNINGS()
-
-NO_UTIL()
-
-CFLAGS(
-    -DHAVE_CONFIG_H
-)
-
-SRCDIR(contrib/tools/ragel6)
-
-SRCS(
-    rlparse.cpp
-    rlscan.cpp
-)
-
-JOIN_SRCS(
-    all_cd.cpp
-    cdcodegen.cpp
-    cdfflat.cpp
-    cdfgoto.cpp
-    cdflat.cpp
-    cdftable.cpp
-    cdgoto.cpp
-    cdipgoto.cpp
-    cdsplit.cpp
-    cdtable.cpp
-)
-
-JOIN_SRCS(
-    all_cs.cpp
-    cscodegen.cpp
-    csfflat.cpp
-    csfgoto.cpp
-    csflat.cpp
-    csftable.cpp
-    csgoto.cpp
-    csipgoto.cpp
-    cssplit.cpp
-    cstable.cpp
-)
-
-JOIN_SRCS(
-    all_fs.cpp
-    fsmap.cpp
-    fsmattach.cpp
-    fsmbase.cpp
-    fsmgraph.cpp
-    fsmmin.cpp
-    fsmstate.cpp
-)
-
-JOIN_SRCS(
-    all_go.cpp
-    gocodegen.cpp
-    gofflat.cpp
-    gofgoto.cpp
-    goflat.cpp
-    goftable.cpp
-    gogoto.cpp
-    goipgoto.cpp
-    gotable.cpp
-    gotablish.cpp
-)
-
-JOIN_SRCS(
-    all_ml.cpp
-    mlcodegen.cpp
-    mlfflat.cpp
-    mlfgoto.cpp
-    mlflat.cpp
-    mlftable.cpp
-    mlgoto.cpp
-    mltable.cpp
-)
-
-JOIN_SRCS(
-    all_r.cpp
-    rbxgoto.cpp
-    redfsm.cpp
-    rubycodegen.cpp
-    rubyfflat.cpp
-    rubyflat.cpp
-    rubyftable.cpp
-    rubytable.cpp
-)
-
-JOIN_SRCS(
-    all_other.cpp
-    common.cpp
-    dotcodegen.cpp
-    gendata.cpp
-    inputdata.cpp
-    javacodegen.cpp
-    main.cpp
-    parsedata.cpp
-    parsetree.cpp
-    xmlcodegen.cpp
-)
-
-END()
diff --git a/contrib/tools/yasm/bin/ya.make b/contrib/tools/yasm/bin/ya.make
deleted file mode 100644
index 96ca75c53e..0000000000
--- a/contrib/tools/yasm/bin/ya.make
+++ /dev/null
@@ -1,120 +0,0 @@
-OWNER(
-    somov
-    g:contrib
-    g:ymake
-)
-
-PROGRAM(yasm)
-
-IF (MUSL)
-    PEERDIR(contrib/libs/musl_extra)
-    PEERDIR(contrib/libs/jemalloc)
-    DISABLE(USE_ASMLIB)
-    NO_RUNTIME()
-    ENABLE(MUSL_LITE)
-ELSE()
-    NO_PLATFORM()
-ENDIF()
-
-NO_CLANG_COVERAGE()
-NO_COMPILER_WARNINGS()
-NO_UTIL()
-
-ALLOCATOR(FAKE)
-
-ADDINCL(
-    contrib/tools/yasm
-    contrib/tools/yasm/frontends/yasm
-    contrib/tools/yasm/modules
-)
-
-CFLAGS(
-    -DHAVE_CONFIG_H
-    -DYASM_LIB_SOURCE
-)
-
-SRCDIR(contrib/tools/yasm)
-
-SRCS(
-    frontends/yasm/yasm-options.c
-    frontends/yasm/yasm.c
-    libyasm/assocdat.c
-    libyasm/bc-align.c
-    libyasm/bc-data.c
-    libyasm/bc-incbin.c
-    libyasm/bc-org.c
-    libyasm/bc-reserve.c
-    libyasm/bitvect.c
-    libyasm/bytecode.c
-    libyasm/cmake-module.c
-    libyasm/errwarn.c
-    libyasm/expr.c
-    libyasm/file.c
-    libyasm/floatnum.c
-    libyasm/hamt.c
-    libyasm/insn.c
-    libyasm/intnum.c
-    libyasm/inttree.c
-    libyasm/linemap.c
-    libyasm/md5.c
-    libyasm/mergesort.c
-    libyasm/phash.c
-    libyasm/replace_path.c
-    libyasm/section.c
-    libyasm/strcasecmp.c
-    libyasm/strsep.c
-    libyasm/symrec.c
-    libyasm/valparam.c
-    libyasm/value.c
-    libyasm/xmalloc.c
-    libyasm/xstrdup.c
-    modules/arch/lc3b/lc3barch.c
-    modules/arch/lc3b/lc3bbc.c
-    modules/arch/x86/x86arch.c
-    modules/arch/x86/x86bc.c
-    modules/arch/x86/x86expr.c
-    modules/arch/x86/x86id.c
-    modules/dbgfmts/codeview/cv-dbgfmt.c
-    modules/dbgfmts/codeview/cv-symline.c
-    modules/dbgfmts/codeview/cv-type.c
-    modules/dbgfmts/dwarf2/dwarf2-aranges.c
-    modules/dbgfmts/dwarf2/dwarf2-dbgfmt.c
-    modules/dbgfmts/dwarf2/dwarf2-info.c
-    modules/dbgfmts/dwarf2/dwarf2-line.c
-    modules/dbgfmts/null/null-dbgfmt.c
-    modules/dbgfmts/stabs/stabs-dbgfmt.c
-    modules/gas-token.c
-    modules/init_plugin.c
-    modules/lc3bid.c
-    modules/listfmts/nasm/nasm-listfmt.c
-    modules/nasm-token.c
-    modules/objfmts/bin/bin-objfmt.c
-    modules/objfmts/coff/coff-objfmt.c
-    modules/objfmts/coff/win64-except.c
-    modules/objfmts/dbg/dbg-objfmt.c
-    modules/objfmts/elf/elf-objfmt.c
-    modules/objfmts/elf/elf-x86-amd64.c
-    modules/objfmts/elf/elf-x86-x32.c
-    modules/objfmts/elf/elf-x86-x86.c
-    modules/objfmts/elf/elf.c
-    modules/objfmts/macho/macho-objfmt.c
-    modules/objfmts/rdf/rdf-objfmt.c
-    modules/objfmts/xdf/xdf-objfmt.c
-    modules/parsers/gas/gas-parse-intel.c
-    modules/parsers/gas/gas-parse.c
-    modules/parsers/gas/gas-parser.c
-    modules/parsers/nasm/nasm-parse.c
-    modules/parsers/nasm/nasm-parser.c
-    modules/preprocs/cpp/cpp-preproc.c
-    modules/preprocs/gas/gas-eval.c
-    modules/preprocs/gas/gas-preproc.c
-    modules/preprocs/nasm/nasm-eval.c
-    modules/preprocs/nasm/nasm-pp.c
-    modules/preprocs/nasm/nasm-preproc.c
-    modules/preprocs/nasm/nasmlib.c
-    modules/preprocs/raw/raw-preproc.c
-    modules/x86cpu.c
-    modules/x86regtmod.c
-)
-
-END()