Skip to content

Commit b9ae5d1

Browse files
committed
Intermediate changes
commit_hash:c22996bdb687071c04e1da70d88db88ae9e3448a
1 parent 6065cf5 commit b9ae5d1

File tree

5 files changed

+2
-150
lines changed

5 files changed

+2
-150
lines changed

contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ ELSEIF (OS_LINUX OR OS_DARWIN)
130130
ELSE()
131131
DEFAULT(CXX_RT "libcxxrt")
132132
ENDIF()
133-
IF (MUSL)
134-
PEERDIR(
135-
contrib/libs/musl/include
136-
)
137-
ENDIF()
138133
ELSEIF (OS_WINDOWS)
139134
SRCS(
140135
src/support/win32/locale_win32.cpp
@@ -157,9 +152,6 @@ ELSEIF (OS_EMSCRIPTEN)
157152
-Wno-unknown-pragmas
158153
-nostdinc++
159154
)
160-
PEERDIR(
161-
contrib/restricted/emscripten/include
162-
)
163155
ELSE()
164156
DEFAULT(CXX_RT "glibcxx_static")
165157
CXXFLAGS(

contrib/libs/cxxsupp/libcxx/ya.make

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,6 @@ ELSEIF (OS_LINUX OR OS_DARWIN)
5252
ELSE()
5353
DEFAULT(CXX_RT "libcxxrt")
5454
ENDIF()
55-
IF (MUSL)
56-
PEERDIR(
57-
contrib/libs/musl/include
58-
)
59-
ENDIF()
6055
ELSEIF (OS_WINDOWS)
6156
SRCS(
6257
src/support/win32/locale_win32.cpp
@@ -77,9 +72,6 @@ ELSEIF (OS_EMSCRIPTEN)
7772
-Wno-unknown-pragmas
7873
-nostdinc++
7974
)
80-
PEERDIR(
81-
contrib/restricted/emscripten/include
82-
)
8375
ELSE()
8476
DEFAULT(CXX_RT "glibcxx_static")
8577
CXXFLAGS(

contrib/python/protobuf/py3/.yandex_meta/build.ym

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ cd ${SRC}/python/google
4848
(
4949
echo 'PY_SRCS('
5050
echo ' TOP_LEVEL'
51-
find . -type f -name '*.py' | sort | sed -En 's|\.\/| google\/|p'
51+
find . -type f -name '*.py' | sed -En 's|\.\/| google\/|p' | env LANG=C sort
5252
echo ')'
5353
) > ya.make.inc
5454

5555
cd ${SRC}/python/google
5656
(
5757
echo 'SRCS('
58-
find . -type f -name '*.cc' | sort | sed -En 's|\.\/| google\/|p'
58+
find . -type f -name '*.cc' | sed -En 's|\.\/| google\/|p' | env LANG=C sort
5959
echo ')'
6060
) >> ya.make.inc
6161

contrib/python/protobuf/py3/patches/disable-deprecated-warning.patch

Whitespace-only changes.

contrib/python/protobuf/py3/patches/pr10403-support-pyhon-3.11.patch_ignored

Lines changed: 0 additions & 132 deletions
This file was deleted.

0 commit comments

Comments
 (0)