Merge pull request #11909 from ydb-platform/mergelibs-241123-2111HEADmain

Library import 241123-2111

6 files changed, 17 insertions, 17 deletions

diff --git a/build/conf/project_specific/yql_udf.conf b/build/conf/project_specific/yql_udf.conf
index 55cd244262..c9456c898d 100644
--- a/build/conf/project_specific/yql_udf.conf
+++ b/build/conf/project_specific/yql_udf.conf
@@ -281,7 +281,7 @@ module YQL_PYTHON_UDF: YQL_UDF_MODULE {
     PEERDIR(build/platform/python/ldflags)
     PEERDIR(library/python/type_info)
 
-    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
+    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/udfs/common/python/python_udf/python_udfs_exports.exports)
 
     when ($WINDOWS == "yes") {
         YQL_PYTHON_UDF_EXPORT=
@@ -307,7 +307,7 @@ module YQL_PYTHON_UDF_PROGRAM: _YQL_UDF_PROGRAM_BASE {
     PEERDIR(build/platform/python/ldflags)
     PEERDIR(library/python/type_info)
 
-    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
+    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/udfs/common/python/python_udf/python_udfs_exports.exports)
 
     when ($WINDOWS == "yes") {
         YQL_PYTHON_UDF_EXPORT=
@@ -331,7 +331,7 @@ module YQL_PYTHON3_UDF: YQL_UDF_MODULE {
     PEERDIR(build/platform/python/ldflags)
     PEERDIR(library/python/type_info)
 
-    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/${YQL_BASE_DIR}/udfs/common/python/python_udf/python_udfs_exports.exports)
+    DEFAULT(YQL_PYTHON_UDF_EXPORT ${ARCADIA_ROOT}/yql/essentials/udfs/common/python/python_udf/python_udfs_exports.exports)
 
     when ($WINDOWS == "yes") {
         YQL_PYTHON_UDF_EXPORT=
diff --git a/build/config/tests/cpp_style/config.clang-format b/build/config/tests/cpp_style/config.clang-format
index 18077255ba..de8822cde5 100644
--- a/build/config/tests/cpp_style/config.clang-format
+++ b/build/config/tests/cpp_style/config.clang-format
@@ -47,6 +47,7 @@ IndentWidth:     4
 TabWidth:        4
 UseTab:          Never
 BreakBeforeBraces: Attach
+InsertBraces: true
 
 # NB: BraceWrapping has no effect unless BreakBeforeBraces is set to Custom
 BraceWrapping:
diff --git a/build/internal/conf/internal.conf b/build/internal/conf/internal.conf
index ff39c54471..a2a1a4559d 100644
--- a/build/internal/conf/internal.conf
+++ b/build/internal/conf/internal.conf
@@ -1,4 +1,4 @@
 # Intentionally empty
 GO_ARCADIA_PROJECT_PREFIX=github.com/ydb-platform/ydb/
-YQL_BASE_DIR=ydb/library/yql
+YQL_BASE_DIR=yql/essentials
 YQL_BASE_TEST_DIR=ydb/library/yql
diff --git a/build/platform/python/ldflags/ya.make b/build/platform/python/ldflags/ya.make
index 0115ed7256..b7a2d83a47 100644
--- a/build/platform/python/ldflags/ya.make
+++ b/build/platform/python/ldflags/ya.make
@@ -1,7 +1,5 @@
 RESOURCES_LIBRARY()
 
-SUBSCRIBER(g:contrib)
-
 IF (USE_SYSTEM_PYTHON)
     IF (OS_LINUX)
         LDFLAGS("-L$EXTERNAL_PYTHON_RESOURCE_GLOBAL/python/lib/x86_64-linux-gnu -lpython${PY_VERSION}")
diff --git a/build/plugins/pybuild.py b/build/plugins/pybuild.py
index bca88ebedc..07ced44d04 100644
--- a/build/plugins/pybuild.py
+++ b/build/plugins/pybuild.py
@@ -209,7 +209,11 @@ def py_program(unit, py3):
         if unit.get('PYTHON_SQLITE3') != 'no':
             peers.append('contrib/tools/python/src/Modules/_sqlite')
     unit.onpeerdir(peers)
-    unit.onwindows_long_path_manifest()
+
+    # DEVTOOLSSUPPORT-53161
+    if os.name == 'nt':
+        unit.onwindows_long_path_manifest()
+
     if unit.get('MODULE_TYPE') == 'PROGRAM':  # can not check DLL
         unit.onadd_check_py_imports()
 
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 77bf04e0a9..46043c6d1f 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -1468,15 +1468,7 @@ class GnuCompiler(Compiler):
             '-Wall',
             '-Wextra',
         ]
-        self.cxx_warnings = [
-            # Issue a warning if certain overload is hidden due to inheritance
-            '-Woverloaded-virtual',
-        ]
-
-        # Disable some warnings which will fail compilation at the time
-        self.c_warnings += [
-            '-Wno-parentheses',
-        ]
+        self.cxx_warnings = []
 
         self.c_defines = ['${hide:CPP_FAKEID}']
         if self.target.is_android:
@@ -1537,13 +1529,16 @@ class GnuCompiler(Compiler):
             self.sfdl_flags.append('-Qunused-arguments')
 
             self.c_warnings += [
+                '-Wno-parentheses',
                 '-Wno-implicit-const-int-float-conversion',
-                # For nvcc to accept the above.
+                # For nvcc to accept the above
                 '-Wno-unknown-warning-option',
             ]
 
             self.cxx_warnings += [
                 '-Wimport-preprocessor-directive-pedantic',
+                # Issue a warning if certain overload is hidden due to inheritance
+                '-Woverloaded-virtual',
                 '-Wno-ambiguous-reversed-operator',
                 '-Wno-defaulted-function-deleted',
                 '-Wno-deprecated-anon-enum-enum-conversion',
@@ -2083,11 +2078,13 @@ class MSVCCompiler(MSVC, Compiler):
 
             c_warnings += [
                 '-Wno-parentheses',
+                # For nvcc to accept the above
                 '-Wno-unknown-warning-option',
             ]
 
             cxx_warnings += [
                 '-Wimport-preprocessor-directive-pedantic',
+                # Issue a warning if certain overload is hidden due to inheritance
                 '-Woverloaded-virtual',
                 '-Wno-ambiguous-reversed-operator',
                 '-Wno-defaulted-function-deleted',