Skip to content

Commit 457aacf

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into merge-libs-250111-0020
2 parents af411bb + 2d3b7f1 commit 457aacf

File tree

85 files changed

+1873
-1883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1873
-1883
lines changed

‎build/conf/licenses.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,6 @@
331331
"X11",
332332
"X11-Lucent",
333333
"X11-XConsortium-Veillard",
334-
"YandexOpen",
335334
"Zlib",
336335
"ZPL-2.1"
337336
]

‎build/conf/linkers/ld.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ elsewhen ($OS_LINUX == "yes" || $OS_DARWIN == "yes" || $OS_IOS == "yes") {
105105
_LD_USE_STDLIB=-nodefaultlibs
106106
}
107107

108-
_C_SYSTEM_LIBRARIES=$_LD_USE_STDLIB $_LD_THREAD_LIBRARY $_LD_SYS_LIB -lc
108+
_C_SYSTEM_LIBRARIES=$_LD_USE_STDLIB $_LD_THREAD_LIBRARY -lc
109109
when ($MUSL == "yes") {
110110
_C_SYSTEM_LIBRARIES=-nostdlib
111111
}
@@ -171,7 +171,7 @@ when ($OS_EMSCRIPTEN == "yes") {
171171
}
172172
_SHARED_FLAG=-shared
173173
when ($OS_EMSCRIPTEN == "yes") {
174-
_SHARED_FLAG=-Wl,-shared -Wl,--no-entry -Wl,--export-all -Wl,--import-memory -Wl,--import-undefined
174+
_SHARED_FLAG=-Wl,-shared -Wl,--no-entry -Wl,--export-all -Wl,--import-memory -Wl,--import-undefined
175175
}
176176
_EXEC_SHARED_FLAG=
177177
when ($OS_LINUX == "yes") {

‎build/conf/sysincl.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,8 @@ otherwise {
106106
SYSINCL+=build/sysincl/nvidia-cub.yml
107107
SYSINCL+=build/sysincl/nvidia-thrust.yml
108108
}
109+
110+
when ($USE_SYSTEM_OPENSSL == "yes") {
111+
SYSINCL+=build/sysincl/openssl-headers.yml
112+
}
113+

‎build/mapping.conf.json

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,14 @@
7272
"3573996018": "https://devtools-registry.s3.yandex.net/3573996018",
7373
"6385637993": "https://devtools-registry.s3.yandex.net/6385637993",
7474
"6385637991": "https://devtools-registry.s3.yandex.net/6385637991",
75+
"7804868939": "https://devtools-registry.s3.yandex.net/7804868939",
76+
"7804868953": "https://devtools-registry.s3.yandex.net/7804868953",
7577
"1841245955": "https://devtools-registry.s3.yandex.net/1841245955",
7678
"1841245849": "https://devtools-registry.s3.yandex.net/1841245849",
79+
"7633873137": "https://devtools-registry.s3.yandex.net/7633873137",
80+
"7633871466": "https://devtools-registry.s3.yandex.net/7633871466",
81+
"7633869171": "https://devtools-registry.s3.yandex.net/7633869171",
82+
"7633866901": "https://devtools-registry.s3.yandex.net/7633866901",
7783
"5424057306": "https://devtools-registry.s3.yandex.net/5424057306",
7884
"5424061624": "https://devtools-registry.s3.yandex.net/5424061624",
7985
"5424033677": "https://devtools-registry.s3.yandex.net/5424033677",
@@ -138,9 +144,13 @@
138144
"6740765286": "https://devtools-registry.s3.yandex.net/6740765286",
139145
"6657758332": "https://devtools-registry.s3.yandex.net/6657758332",
140146
"6782718840": "https://devtools-registry.s3.yandex.net/6782718840",
147+
"7793716307": "https://devtools-registry.s3.yandex.net/7793716307",
141148
"7412448309": "https://devtools-registry.s3.yandex.net/7412448309",
149+
"7793563818": "https://devtools-registry.s3.yandex.net/7793563818",
142150
"7412319411": "https://devtools-registry.s3.yandex.net/7412319411",
151+
"7793786096": "https://devtools-registry.s3.yandex.net/7793786096",
143152
"7412751020": "https://devtools-registry.s3.yandex.net/7412751020",
153+
"7793618601": "https://devtools-registry.s3.yandex.net/7793618601",
144154
"7412874863": "https://devtools-registry.s3.yandex.net/7412874863",
145155
"7421008516": "https://devtools-registry.s3.yandex.net/7421008516",
146156
"7421180051": "https://devtools-registry.s3.yandex.net/7421180051",
@@ -1017,6 +1027,8 @@
10171027
"3166999959": "https://devtools-registry.s3.yandex.net/3166999959",
10181028
"65627450": "https://devtools-registry.s3.yandex.net/65627450",
10191029
"65627451": "https://devtools-registry.s3.yandex.net/65627451",
1030+
"6442167169": "https://devtools-registry.s3.yandex.net/6442167169",
1031+
"7503032594": "https://devtools-registry.s3.yandex.net/7503032594",
10201032
"5631222854": "https://devtools-registry.s3.yandex.net/5631222854",
10211033
"5631220729": "https://devtools-registry.s3.yandex.net/5631220729",
10221034
"5631255103": "https://devtools-registry.s3.yandex.net/5631255103",
@@ -1141,13 +1153,7 @@
11411153
"7686710688": "https://devtools-registry.s3.yandex.net/7686710688",
11421154
"2980468199": "https://devtools-registry.s3.yandex.net/2980468199",
11431155
"5562224408": "https://devtools-registry.s3.yandex.net/5562224408",
1144-
"7663495611": "https://devtools-registry.s3.yandex.net/7663495611",
1145-
"6442167169": "https://devtools-registry.s3.yandex.net/6442167169",
1146-
"7503032594": "https://devtools-registry.s3.yandex.net/7503032594",
1147-
"7633866901": "https://devtools-registry.s3.yandex.net/7633866901",
1148-
"7633869171": "https://devtools-registry.s3.yandex.net/7633869171",
1149-
"7633871466": "https://devtools-registry.s3.yandex.net/7633871466",
1150-
"7633873137": "https://devtools-registry.s3.yandex.net/7633873137"
1156+
"7663495611": "https://devtools-registry.s3.yandex.net/7663495611"
11511157
},
11521158
"resources_descriptions": {
11531159
"6277415836": "Allure 2.29.0",
@@ -1221,8 +1227,14 @@
12211227
"3573996018": "JAVA_LIBRARY-none-none-proto-google-common-protos-2.9.0.jar",
12221228
"6385637993": "JAVA_LIBRARY-none-none-protobuf-java-3.25.3-sources.jar",
12231229
"6385637991": "JAVA_LIBRARY-none-none-protobuf-java-3.25.3.jar",
1230+
"7804868939": "JAVA_LIBRARY-none-none-protobuf-java-3.25.5-sources.jar",
1231+
"7804868953": "JAVA_LIBRARY-none-none-protobuf-java-3.25.5.jar",
12241232
"1841245955": "JAVA_LIBRARY-none-none-snakeyaml-1.27-sources.jar",
12251233
"1841245849": "JAVA_LIBRARY-none-none-snakeyaml-1.27.jar",
1234+
"7633873137": "Node.js 20.18.1 for darwin-arm64",
1235+
"7633871466": "Node.js 20.18.1 for darwin-x64",
1236+
"7633869171": "Node.js 20.18.1 for linux-arm64",
1237+
"7633866901": "Node.js 20.18.1 for linux-x64",
12261238
"5424057306": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.darwin-amd64.tar.gz",
12271239
"5424061624": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.darwin-arm64.tar.gz",
12281240
"5424033677": "OTHER_RESOURCE-none-1.21.3-y_go1.21.3.linux-amd64.tar.gz",
@@ -1287,9 +1299,13 @@
12871299
"6740765286": "bin-lld-16-optimized-linux-x86_64-30f81a61922d8f6d21a62ad26f7a3711ec368b9f",
12881300
"6657758332": "bin-lld-16-optimized-linux-x86_64-6fcb1f9a0ea89cca05d938ce61f89490b56940c4",
12891301
"6782718840": "bin-lld-16-optimized-linux-x86_64-e9ee8ec890c372b0d234bbdc8d711e991af44797",
1302+
"7793716307": "bin-lld-18-darwin-arm64-707d422c95662f1a2f53ee2de8c4d05db9eaeb33",
12901303
"7412448309": "bin-lld-18-darwin-arm64-9ed8f351aa52a09a3d6ab1d977afb583bf69d8d5",
1304+
"7793563818": "bin-lld-18-darwin-x86_64-707d422c95662f1a2f53ee2de8c4d05db9eaeb33",
12911305
"7412319411": "bin-lld-18-darwin-x86_64-9ed8f351aa52a09a3d6ab1d977afb583bf69d8d5",
1306+
"7793786096": "bin-lld-18-linux-aarch64-707d422c95662f1a2f53ee2de8c4d05db9eaeb33",
12921307
"7412751020": "bin-lld-18-linux-aarch64-9ed8f351aa52a09a3d6ab1d977afb583bf69d8d5",
1308+
"7793618601": "bin-lld-18-linux-x86_64-707d422c95662f1a2f53ee2de8c4d05db9eaeb33",
12931309
"7412874863": "bin-lld-18-linux-x86_64-9ed8f351aa52a09a3d6ab1d977afb583bf69d8d5",
12941310
"7421008516": "bin-mold-darwin-arm64-9ed8f351aa52a09a3d6ab1d977afb583bf69d8d5",
12951311
"7421180051": "bin-mold-darwin-x86_64-9ed8f351aa52a09a3d6ab1d977afb583bf69d8d5",
@@ -2166,6 +2182,8 @@
21662182
"3166999959": "openjdk 11.0.15 vanilla for windows",
21672183
"65627450": "org.jetbrains-annotations-13.0-sources.jar",
21682184
"65627451": "org.jetbrains-annotations-13.0.jar",
2185+
"6442167169": "pnpm 8.6.12",
2186+
"7503032594": "pnpm 9.12.3 (default)",
21692187
"5631222854": "python3 for darwin",
21702188
"5631220729": "python3 for darwin-arm64",
21712189
"5631255103": "python3 for linux",
@@ -2290,13 +2308,7 @@
22902308
"7686710688": "yt/go/ytrecipe/cmd/ytexec for linux",
22912309
"2980468199": "ytexec for linux",
22922310
"5562224408": "ytexec for linux",
2293-
"7663495611": "ytexec for linux",
2294-
"6442167169": "pnpm 8.6.12",
2295-
"7503032594": "pnpm 9.12.3 (default)",
2296-
"7633866901": "Node.js 20.18.1 for linux-x64",
2297-
"7633869171": "Node.js 20.18.1 for linux-arm64",
2298-
"7633871466": "Node.js 20.18.1 for darwin-x64",
2299-
"7633873137": "Node.js 20.18.1 for darwin-arm64"
2311+
"7663495611": "ytexec for linux"
23002312
},
23012313
"resources_info": {},
23022314
"tasks": {}

‎build/platform/lld/lld18.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"by_platform": {
33
"darwin-arm64": {
4-
"uri": "sbr:7412448309"
4+
"uri": "sbr:7793716307"
55
},
66
"darwin-x86_64": {
7-
"uri": "sbr:7412319411"
7+
"uri": "sbr:7793563818"
88
},
99
"linux-aarch64": {
10-
"uri": "sbr:7412751020"
10+
"uri": "sbr:7793786096"
1111
},
1212
"linux-x86_64": {
13-
"uri": "sbr:7412874863"
13+
"uri": "sbr:7793618601"
1414
}
1515
}
1616
}

‎build/sysincl/openssl-headers.yml

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
- includes:
2+
- openssl/aes.h
3+
- openssl/asn1.h
4+
- openssl/asn1_mac.h
5+
- openssl/asn1err.h
6+
- openssl/asn1t.h
7+
- openssl/async.h
8+
- openssl/asyncerr.h
9+
- openssl/bio.h
10+
- openssl/bioerr.h
11+
- openssl/blowfish.h
12+
- openssl/bn.h
13+
- openssl/bnerr.h
14+
- openssl/buffer.h
15+
- openssl/buffererr.h
16+
- openssl/camellia.h
17+
- openssl/cast.h
18+
- openssl/cmac.h
19+
- openssl/cms.h
20+
- openssl/cmserr.h
21+
- openssl/comp.h
22+
- openssl/comperr.h
23+
- openssl/conf.h
24+
- openssl/conf_api.h
25+
- openssl/conferr.h
26+
- openssl/configurator.h
27+
- openssl/crypto.h
28+
- openssl/cryptoerr.h
29+
- openssl/ct.h
30+
- openssl/cterr.h
31+
- openssl/des.h
32+
- openssl/dh.h
33+
- openssl/dherr.h
34+
- openssl/dsa.h
35+
- openssl/dsaerr.h
36+
- openssl/dtls1.h
37+
- openssl/e_os2.h
38+
- openssl/ebcdic.h
39+
- openssl/ec.h
40+
- openssl/ecdh.h
41+
- openssl/ecdsa.h
42+
- openssl/ecerr.h
43+
- openssl/engine.h
44+
- openssl/engineerr.h
45+
- openssl/err.h
46+
- openssl/evp.h
47+
- openssl/evperr.h
48+
- openssl/fips.h
49+
- openssl/fips_rand.h
50+
- openssl/hmac.h
51+
- openssl/idea.h
52+
- openssl/kdf.h
53+
- openssl/kdferr.h
54+
- openssl/lhash.h
55+
- openssl/md2.h
56+
- openssl/md4.h
57+
- openssl/md5.h
58+
- openssl/mdc2.h
59+
- openssl/modes.h
60+
- openssl/obj_mac.h
61+
- openssl/objects.h
62+
- openssl/objectserr.h
63+
- openssl/ocsp.h
64+
- openssl/ocsperr.h
65+
- openssl/opensslconf-android-arm.h
66+
- openssl/opensslconf-android-arm64.h
67+
- openssl/opensslconf-android-i686.h
68+
- openssl/opensslconf-android-x86_64.h
69+
- openssl/opensslconf-i386.h
70+
- openssl/opensslconf-ios-arm64.h
71+
- openssl/opensslconf-ios-x86_64.h
72+
- openssl/opensslconf-linux-aarch64.h
73+
- openssl/opensslconf-linux-arm.h
74+
- openssl/opensslconf-linux.h
75+
- openssl/opensslconf-osx-arm64.h
76+
- openssl/opensslconf-osx.h
77+
- openssl/opensslconf-win-i686.h
78+
- openssl/opensslconf-win-x86_64.h
79+
- openssl/opensslconf-x86_64.h
80+
- openssl/opensslconf.h
81+
- openssl/opensslconf.h
82+
- openssl/opensslv.h
83+
- openssl/ossl_typ.h
84+
- openssl/pem.h
85+
- openssl/pem2.h
86+
- openssl/pemerr.h
87+
- openssl/pkcs12.h
88+
- openssl/pkcs12err.h
89+
- openssl/pkcs7.h
90+
- openssl/pkcs7err.h
91+
- openssl/rand.h
92+
- openssl/rand_drbg.h
93+
- openssl/randerr.h
94+
- openssl/rc2.h
95+
- openssl/rc4.h
96+
- openssl/rc5.h
97+
- openssl/ripemd.h
98+
- openssl/rsa.h
99+
- openssl/rsaerr.h
100+
- openssl/safestack.h
101+
- openssl/seed.h
102+
- openssl/sha.h
103+
- openssl/srp.h
104+
- openssl/srtp.h
105+
- openssl/ssl.h
106+
- openssl/ssl2.h
107+
- openssl/ssl3.h
108+
- openssl/sslerr.h
109+
- openssl/stack.h
110+
- openssl/store.h
111+
- openssl/storeerr.h
112+
- openssl/symhacks.h
113+
- openssl/tls1.h
114+
- openssl/ts.h
115+
- openssl/tserr.h
116+
- openssl/txt_db.h
117+
- openssl/ui.h
118+
- openssl/uierr.h
119+
- openssl/whrlpool.h
120+
- openssl/x509.h
121+
- openssl/x509_vfy.h
122+
- openssl/x509err.h
123+
- openssl/x509v3.h
124+
- openssl/x509v3err.h

‎build/ymake.core.conf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1084,10 +1084,6 @@ module _LINK_UNIT: _BASE_UNIT {
10841084
PEERDIR+=contrib/libs/clang${CLANG_VER}-rt/lib/profile
10851085
}
10861086

1087-
when ($USE_LIBCXXRT == "yes") {
1088-
PEERDIR += contrib/libs/cxxsupp/libcxxrt
1089-
}
1090-
10911087
when ($USE_DYNAMIC_CUDA == "yes") {
10921088
LINK_DYN_LIB_FLAGS += --dynamic-cuda
10931089
LINK_SCRIPT_EXE_FLAGS += --dynamic-cuda

‎build/ymake_conf.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,11 +1070,6 @@ def __init__(self, build, detector):
10701070

10711071
self.dwarf_tool = self.target.find_in_dict(self.params.get('dwarf_tool'))
10721072

1073-
# TODO(somov): Унифицировать формат sys_lib
1074-
self.sys_lib = self.params.get('sys_lib', {})
1075-
if isinstance(self.sys_lib, dict):
1076-
self.sys_lib = self.target.find_in_dict(self.sys_lib, [])
1077-
10781073
self.os_sdk = preset('OS_SDK') or self._default_os_sdk()
10791074

10801075
self.os_sdk_local = False
@@ -1718,8 +1713,6 @@ def __init__(self, tc, build):
17181713
if self.ld_sdk:
17191714
self.ld_flags.append(self.ld_sdk)
17201715

1721-
self.sys_lib = self.tc.sys_lib
1722-
17231716
if target.is_android:
17241717
# Use toolchain defaults to link with libunwind/clang_rt.builtins
17251718
self.use_stdlib = '-nostdlib++'
@@ -1737,7 +1730,6 @@ def print_linker(self):
17371730
emit('OBJDUMP_TOOL_VENDOR', self.objdump)
17381731

17391732
emit('_LD_FLAGS', self.ld_flags)
1740-
emit('_LD_SYS_LIB', self.sys_lib)
17411733
emit('LD_SDK_VERSION', self.ld_sdk)
17421734

17431735
dwarf_tool = self.tc.dwarf_tool

‎contrib/libs/apache/avro/.yandex_meta/__init__.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ def post_install(self):
1010
boost.make_arcdir("any"),
1111
boost.make_arcdir("asio"),
1212
boost.make_arcdir("crc"),
13-
boost.make_arcdir("format"),
1413
boost.make_arcdir("math"),
1514
]
1615

‎contrib/libs/apache/avro/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ PEERDIR(
1919
contrib/restricted/boost/any
2020
contrib/restricted/boost/asio
2121
contrib/restricted/boost/crc
22-
contrib/restricted/boost/format
2322
contrib/restricted/boost/iostreams
2423
contrib/restricted/boost/math
2524
)

0 commit comments

Comments
 (0)