Merge branch 'rightlib' into merge-libs-241224-2313

3 files changed, 12 insertions, 3 deletions

diff --git a/build/conf/opensource.conf b/build/conf/opensource.conf
index b37af16b23..95253b4c63 100644
--- a/build/conf/opensource.conf
+++ b/build/conf/opensource.conf
@@ -34,6 +34,10 @@ when ($OPENSOURCE == "yes") {
 
 when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") {
     RECURSIVE_ADD_PEERS_TESTS=yes
+    # The only reason to set it is to avoid any deps on contrib/python|contrib/libs/python when
+    # exporting PY_*_MODULE and force dependency to build/platform/python there.
+    USE_SYSTEM_PYTHON=3.10
+    USE_ARCADIA_PYTHON=no
     EXPORT_SEM=yes
     EXPORTED_BUILD_SYSTEM_SOURCE_ROOT=${"$"}{PROJECT_SOURCE_DIR}
     EXPORTED_BUILD_SYSTEM_BUILD_ROOT=${"$"}{PROJECT_BINARY_DIR}
@@ -42,7 +46,7 @@ when ($OPENSOURCE == "yes" && $EXPORT_GRADLE == "yes") {
 # Extra macros to control how cmake export works
 
 when ($OPENSOURCE == "yes" && $EXPORT_CMAKE == "yes") {
-    # Python version is not acttually used in exported cmake's rigth now.
+    # Python version is not actually used in exported cmake's rigth now.
     # The only reason to set it is to avoid any deps on contrib/python|contrib/libs/python when
     # exporting PY_*_MODULE and force dependency to build/platform/python there.
     USE_SYSTEM_PYTHON=3.10
diff --git a/build/conf/proto.conf b/build/conf/proto.conf
index 988206de22..5676cccbb2 100644
--- a/build/conf/proto.conf
+++ b/build/conf/proto.conf
@@ -848,6 +848,7 @@ multimodule PROTO_LIBRARY {
     }
 
     module TS_PROTO: _TS_PROTO {
+        .SEM=_SEM_IGNORED
         # opt-in. We don't want to have TS_PROTO by default
         # To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO TS_PREPARE_DEPS) in ya.make
         .INCLUDE_TAG=no
@@ -857,6 +858,7 @@ multimodule PROTO_LIBRARY {
     }
 
     module TS_PREPARE_DEPS: _TS_PREPARE_DEPS {
+        .SEM=_SEM_IGNORED
         .INCLUDE_TAG=no
         SET_APPEND(PEERDIR_TAGS TS_PREPARE_DEPS)
     }
@@ -931,6 +933,7 @@ multimodule PROTO_SCHEMA {
     }
 
     module TS_PROTO_FROM_SCHEMA: _TS_PROTO {
+        .SEM=_SEM_IGNORED
         # opt-in. We don't want to have TS_PROTO by default
         # To include TS_PROTO user have to set INCLUDE_TAGS(TS_PROTO TS_PREPARE_DEPS) in ya.make
         .INCLUDE_TAG=no
@@ -941,6 +944,7 @@ multimodule PROTO_SCHEMA {
     }
 
     module TS_PREPARE_DEPS_FROM_SCHEMA: _TS_PREPARE_DEPS {
+        .SEM=_SEM_IGNORED
         .INCLUDE_TAG=no
         DISABLE(START_TARGET)
         SET_APPEND(PEERDIR_TAGS TS_PREPARE_DEPS TS_PREPARE_DEPS_FROM_SCHEMA)
@@ -953,6 +957,7 @@ multimodule PROTO_SCHEMA {
     }
 
     module PROTO_DESCRIPTIONS_: PROTO_DESCRIPTIONS {
+        .SEM=_SEM_IGNORED
         .PEERDIRSELF=DESC_PROTO_FROM_SCHEMA
         .FINAL_TARGET=yes
         SET_APPEND(PEERDIR_TAGS DESC_PROTO_FROM_SCHEMA)
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 26e521b827..81378b608b 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -4300,7 +4300,7 @@ macro OWNER(Owners...) {
     ENABLE(UNUSED_MACRO)
 }
 
-### @usage: SUBSCIBER(UsersOrGroups)
+### @usage: SUBSCRIBER(UsersOrGroups)
 ###
 ### Add observers of the code.
 ### In the SUBSCRIBER macro you can use:
@@ -4309,7 +4309,7 @@ macro OWNER(Owners...) {
 ###
 ### Note: currently SUBSCRIBER is read only by Arcanum and is not processed by
 ### the build system. It's planned to be phased out in favor of subcription via a.yaml
-macro SUBSCIBER(Subscribers...) {
+macro SUBSCRIBER(Subscribers...) {
     ENABLE(UNUSED_MACRO)
 }