Intermediate changes

commit_hash:c22996bdb687071c04e1da70d88db88ae9e3448a

5 files changed, 2 insertions, 150 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym b/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
index d3b0d5a9d0..be4f2e29e1 100644
--- a/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
+++ b/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
@@ -130,11 +130,6 @@ ELSEIF (OS_LINUX OR OS_DARWIN)
     ELSE()
         DEFAULT(CXX_RT "libcxxrt")
     ENDIF()
-    IF (MUSL)
-        PEERDIR(
-            contrib/libs/musl/include
-        )
-    ENDIF()
 ELSEIF (OS_WINDOWS)
     SRCS(
         src/support/win32/locale_win32.cpp
@@ -157,9 +152,6 @@ ELSEIF (OS_EMSCRIPTEN)
         -Wno-unknown-pragmas
         -nostdinc++
     )
-    PEERDIR(
-        contrib/restricted/emscripten/include
-    )
 ELSE()
     DEFAULT(CXX_RT "glibcxx_static")
     CXXFLAGS(
diff --git a/contrib/libs/cxxsupp/libcxx/ya.make b/contrib/libs/cxxsupp/libcxx/ya.make
index 7b42dc7e51..948d390d82 100644
--- a/contrib/libs/cxxsupp/libcxx/ya.make
+++ b/contrib/libs/cxxsupp/libcxx/ya.make
@@ -52,11 +52,6 @@ ELSEIF (OS_LINUX OR OS_DARWIN)
     ELSE()
         DEFAULT(CXX_RT "libcxxrt")
     ENDIF()
-    IF (MUSL)
-        PEERDIR(
-            contrib/libs/musl/include
-        )
-    ENDIF()
 ELSEIF (OS_WINDOWS)
     SRCS(
         src/support/win32/locale_win32.cpp
@@ -77,9 +72,6 @@ ELSEIF (OS_EMSCRIPTEN)
         -Wno-unknown-pragmas
         -nostdinc++
     )
-    PEERDIR(
-        contrib/restricted/emscripten/include
-    )
 ELSE()
     DEFAULT(CXX_RT "glibcxx_static")
     CXXFLAGS(
diff --git a/contrib/python/protobuf/py3/.yandex_meta/build.ym b/contrib/python/protobuf/py3/.yandex_meta/build.ym
index 0c9f6c0d70..34189e4f65 100644
--- a/contrib/python/protobuf/py3/.yandex_meta/build.ym
+++ b/contrib/python/protobuf/py3/.yandex_meta/build.ym
@@ -48,14 +48,14 @@ cd ${SRC}/python/google
 (
 echo 'PY_SRCS('
 echo '    TOP_LEVEL'
-find . -type f -name '*.py' | sort | sed -En 's|\.\/|    google\/|p'
+find . -type f -name '*.py' | sed -En 's|\.\/|    google\/|p' | env LANG=C sort
 echo ')'
 ) > ya.make.inc
 
 cd ${SRC}/python/google
 (
 echo 'SRCS('
-find . -type f -name '*.cc' |  sort | sed -En 's|\.\/|    google\/|p'
+find . -type f -name '*.cc' | sed -En 's|\.\/|    google\/|p' | env LANG=C sort
 echo ')'
 ) >> ya.make.inc
 
diff --git a/contrib/python/protobuf/py3/patches/disable-deprecated-warning.patch b/contrib/python/protobuf/py3/patches/disable-deprecated-warning.patch
deleted file mode 100644
index e69de29bb2..0000000000
--- a/contrib/python/protobuf/py3/patches/disable-deprecated-warning.patch
+++ /dev/null
diff --git a/contrib/python/protobuf/py3/patches/pr10403-support-pyhon-3.11.patch_ignored b/contrib/python/protobuf/py3/patches/pr10403-support-pyhon-3.11.patch_ignored
deleted file mode 100644
index e06256b285..0000000000
--- a/contrib/python/protobuf/py3/patches/pr10403-support-pyhon-3.11.patch_ignored
+++ /dev/null
@@ -1,132 +0,0 @@
-From da973aff2adab60a9e516d3202c111dbdde1a50f Mon Sep 17 00:00:00 2001
-From: Alexander Shadchin <alexandr.shadchin@gmail.com>
-Date: Sun, 14 Aug 2022 21:13:49 +0300
-Subject: [PATCH] Fix build with Python 3.11
-
-The PyFrameObject structure members have been removed from the public C API.
----
- python/google/protobuf/pyext/descriptor.cc | 75 ++++++++++++++++++----
- 1 file changed, 62 insertions(+), 13 deletions(-)
-
-diff --git a/python/google/protobuf/pyext/descriptor.cc b/python/google/protobuf/pyext/descriptor.cc
-index fc83acf01a7..fc97b0fa6c1 100644
---- a/google/protobuf/pyext/descriptor.cc
-+++ b/google/protobuf/pyext/descriptor.cc
-@@ -56,6 +56,37 @@
-               : 0)                                               \
-        : PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
- 
-+#if PY_VERSION_HEX < 0x030900B1 && !defined(PYPY_VERSION)
-+static PyCodeObject* PyFrame_GetCode(PyFrameObject *frame)
-+{
-+    Py_INCREF(frame->f_code);
-+    return frame->f_code;
-+}
-+
-+static PyFrameObject* PyFrame_GetBack(PyFrameObject *frame)
-+{
-+    Py_XINCREF(frame->f_back);
-+    return frame->f_back;
-+}
-+#endif
-+
-+#if PY_VERSION_HEX < 0x030B00A7 && !defined(PYPY_VERSION)
-+static PyObject* PyFrame_GetLocals(PyFrameObject *frame)
-+{
-+    if (PyFrame_FastToLocalsWithError(frame) < 0) {
-+        return NULL;
-+    }
-+    Py_INCREF(frame->f_locals);
-+    return frame->f_locals;
-+}
-+
-+static PyObject* PyFrame_GetGlobals(PyFrameObject *frame)
-+{
-+    Py_INCREF(frame->f_globals);
-+    return frame->f_globals;
-+}
-+#endif
-+
- namespace google {
- namespace protobuf {
- namespace python {
-@@ -127,48 +127,66 @@ bool _CalledFromGeneratedFile(int stacklevel) {
-   // This check is not critical and is somewhat difficult to implement correctly
-   // in PyPy.
-   PyFrameObject* frame = PyEval_GetFrame();
-+  PyCodeObject* frame_code = nullptr;
-+  PyObject* frame_globals = nullptr;
-+  PyObject* frame_locals = nullptr;
-+  bool result = false;
-+
-   if (frame == nullptr) {
--    return false;
-+    goto exit;
-   }
-+  Py_INCREF(frame);
-   while (stacklevel-- > 0) {
--    frame = frame->f_back;
-+    PyFrameObject* next_frame = PyFrame_GetBack(frame);
-+    Py_DECREF(frame);
-+    frame = next_frame;
-     if (frame == nullptr) {
--      return false;
-+      goto exit;
-     }
-   }
- 
--  if (frame->f_code->co_filename == nullptr) {
--    return false;
-+  frame_code = PyFrame_GetCode(frame);
-+  if (frame_code->co_filename == nullptr) {
-+    goto exit;
-   }
-   char* filename;
-   Py_ssize_t filename_size;
--  if (PyString_AsStringAndSize(frame->f_code->co_filename,
-+  if (PyString_AsStringAndSize(frame_code->co_filename,
-                                &filename, &filename_size) < 0) {
-     // filename is not a string.
-     PyErr_Clear();
--    return false;
-+    goto exit;
-   }
-   if ((filename_size < 3) ||
-       (strcmp(&filename[filename_size - 3], ".py") != 0)) {
-     // Cython's stack does not have .py file name and is not at global module
-     // scope.
--    return true;
-+    result = true;
-+    goto exit;
-   }
-   if (filename_size < 7) {
-     // filename is too short.
--    return false;
-+    goto exit;
-   }
-   if (strcmp(&filename[filename_size - 7], "_pb2.py") != 0) {
-     // Filename is not ending with _pb2.
--    return false;
-+    goto exit;
-   }
- 
--  if (frame->f_globals != frame->f_locals) {
-+  frame_globals = PyFrame_GetGlobals(frame);
-+  frame_locals = PyFrame_GetLocals(frame);
-+  if (frame_globals != frame_locals) {
-     // Not at global module scope
--    return false;
-+    goto exit;
-   }
- #endif
--  return true;
-+  result = true;
-+exit:
-+  Py_XDECREF(frame_globals);
-+  Py_XDECREF(frame_locals);
-+  Py_XDECREF(frame_code);
-+  Py_XDECREF(frame);
-+  return result;
- }
- 
- // If the calling code is not a _pb2.py file, raise AttributeError.