Merge pull request #8032 from ydb-platform/mergelibs-240819-2038

Library import 240819-2038

Author: maximyurchuk

build/conf/proto.conf

@@ -634,10 +634,15 @@ macro _GENERATE_PY_EVS_INTERNAL(FILES...) {
 ###
 ### TODO: proper implementation needed
 macro LIST_PROTO(TO="files.proto", Files...) {
-    .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files} && $YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${output;noext;suf=.pb.h:TO}
+    .CMD=$YMAKE_PYTHON3 ${input:"build/scripts/list.py"} ${Files} ${input;hide:Files} ${stdout;output;noauto:TO} ${output_include;from_input;hide:Files}
+    _COMPILE_LIST_PROTO(${TO})
     _EXPOSE(${TO})
 }
 
+macro _COMPILE_LIST_PROTO(SRC) {
+    .CMD=$YMAKE_PYTHON ${input:"build/scripts/touch.py"} ${input;hide:SRC} ${output;noext;suf=.pb.h:SRC}
+}
+
 # tag:proto
 macro _PROTO_DESC_RAWPROTO_CMD(File) {
     .CMD=${cwd;rootdir;input:File} $YMAKE_PYTHON3 ${input:"build/scripts/desc_rawproto_wrapper.py"} --desc-output ${output;suf=.desc:File} --rawproto-output ${output;norel;suf=.${_MODDIR_HASH}.rawproto:File} --proto-file ${input;rootrel:File} -- $PROTOC -I=./$PROTO_NAMESPACE -I=$ARCADIA_ROOT/$PROTO_NAMESPACE ${pre=-I=:_PROTO__INCLUDE} -I=$ARCADIA_BUILD_ROOT -I=$PROTOBUF_INCLUDE_PATH --include_source_info $_PROTOC_FLAGS ${hide:PROTO_FAKEID}

build/export_generators/cmake/root_cmake_lists.jinja

@@ -7,13 +7,12 @@ endif()
 
 project({{ project_name }} LANGUAGES
 {%- for project_language in project_languages -%}
-{%-     if project_language == "ASM" -%}
-{%          set has_asm = true %}
-{%-     else  %} {{ project_language }}
+{%-     if project_language != "ASM" %} {{ project_language }}
 {%-     endif  -%}
-{%-     if has_asm %} ASM
+{%-     if (loop.last) and ("ASM" in project_languages) %} ASM
 {%-     endif  -%}
-{%- endfor -%})
+{%- endfor -%}
+)
 
 set(BUILD_SHARED_LIBS Off)
 set(CMAKE_CXX_STANDARD 20)

contrib/restricted/boost/interprocess/ya.make

@@ -9,9 +9,9 @@ LICENSE(
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
 
-VERSION(1.85.0)
+VERSION(1.86.0)
 
-ORIGINAL_SOURCE(https://github.com/boostorg/interprocess/archive/boost-1.85.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/interprocess/archive/boost-1.86.0.tar.gz)
 
 PEERDIR(
     contrib/restricted/boost/assert

contrib/tools/python3/Include/pyconfig-win.h

@@ -0,0 +1,7 @@
+// Override _WIN32_WINNT
+#undef _WIN32_WINNT
+#define _WIN32_WINNT Py_WINVER
+
+#define Py_NO_ENABLE_SHARED
+
+#include "../PC/pyconfig.h"

contrib/tools/python3/Include/pyconfig.h

@@ -25,28 +25,21 @@
 
 #endif
 
-#if defined(__linux__)
-#include "pyconfig-linux.h"
+#if !defined(NDEBUG) && !defined(Py_DEBUG) && !defined(Py_LIMITED_API) && !defined(DISABLE_PYDEBUG)
+#define Py_DEBUG
+#define GC_NDEBUG
 #endif
 
 #if defined(__APPLE__) && (defined(__aarch64__) || defined(_M_ARM64))
 #   include "pyconfig-osx-arm64.h"
 #elif defined(__APPLE__) && (defined(__x86_64__) || defined(_M_X64))
 #   include "pyconfig-osx-x86_64.h"
-#endif
-
-#if defined(_MSC_VER)
-#define NTDDI_VERSION 0x06020000
-#define _WIN32_WINNT 0x0602
-#define Py_NO_ENABLE_SHARED
-#include "../PC/pyconfig.h"
+#elif defined(_MSC_VER)
+#   include "pyconfig-win.h"
+#else
+#   include "pyconfig-linux.h"
 #endif
 
 #if defined(_musl_)
-#include "pyconfig-musl.h"
-#endif
-
-#if !defined(NDEBUG) && !defined(Py_DEBUG) && !defined(Py_LIMITED_API) && !defined(DISABLE_PYDEBUG)
-#define Py_DEBUG
-#define GC_NDEBUG
+#   include "pyconfig-musl.h"
 #endif

ydb/ci/rightlib.txt

@@ -1 +1 @@
-6736ef52165b42c9537dc7e81346c5ef1568f2a1
+397a82f8ab18a1a8a252dcb9b5420720a316677c