Skip to content

Commit df11a17

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into merge-libs-250220-0050
2 parents b1f202d + a650790 commit df11a17

File tree

197 files changed

+1587
-778
lines changed

Some content is hidden

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

197 files changed

+1587
-778
lines changed

‎build/external_resources/ymake/public.resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8000013577"
4+
"uri": "sbr:8069587979"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8000012780"
7+
"uri": "sbr:8069587058"
88
},
99
"linux": {
10-
"uri": "sbr:8000014871"
10+
"uri": "sbr:8069590186"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8000012216"
13+
"uri": "sbr:8069586009"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:8000014239"
16+
"uri": "sbr:8069588665"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:8000017801"
4+
"uri": "sbr:8069586455"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:8000017375"
7+
"uri": "sbr:8069585048"
88
},
99
"linux": {
10-
"uri": "sbr:8000018764"
10+
"uri": "sbr:8069588472"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:8000016896"
13+
"uri": "sbr:8069583885"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:8000018351"
16+
"uri": "sbr:8069587643"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"bottles": {},
33
"resources": {
4-
"8018811524": "https://devtools-registry.s3.yandex.net/8018811524",
54
"6277415836": "https://devtools-registry.s3.yandex.net/6277415836",
65
"2214720943": "https://devtools-registry.s3.yandex.net/2214720943",
76
"2214542408": "https://devtools-registry.s3.yandex.net/2214542408",
@@ -498,7 +497,9 @@
498497
"7914217459": "https://devtools-registry.s3.yandex.net/7914217459",
499498
"7948644946": "https://devtools-registry.s3.yandex.net/7948644946",
500499
"7994647367": "https://devtools-registry.s3.yandex.net/7994647367",
500+
"8018811524": "https://devtools-registry.s3.yandex.net/8018811524",
501501
"8029671029": "https://devtools-registry.s3.yandex.net/8029671029",
502+
"8067063302": "https://devtools-registry.s3.yandex.net/8067063302",
502503
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
503504
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
504505
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -689,6 +690,7 @@
689690
"7922609627": "https://devtools-registry.s3.yandex.net/7922609627",
690691
"7949054326": "https://devtools-registry.s3.yandex.net/7949054326",
691692
"8000013577": "https://devtools-registry.s3.yandex.net/8000013577",
693+
"8069587979": "https://devtools-registry.s3.yandex.net/8069587979",
692694
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
693695
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
694696
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -754,6 +756,7 @@
754756
"7922609038": "https://devtools-registry.s3.yandex.net/7922609038",
755757
"7949053519": "https://devtools-registry.s3.yandex.net/7949053519",
756758
"8000012780": "https://devtools-registry.s3.yandex.net/8000012780",
759+
"8069587058": "https://devtools-registry.s3.yandex.net/8069587058",
757760
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
758761
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
759762
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -819,6 +822,7 @@
819822
"7922610908": "https://devtools-registry.s3.yandex.net/7922610908",
820823
"7949055512": "https://devtools-registry.s3.yandex.net/7949055512",
821824
"8000014871": "https://devtools-registry.s3.yandex.net/8000014871",
825+
"8069590186": "https://devtools-registry.s3.yandex.net/8069590186",
822826
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
823827
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
824828
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -884,6 +888,7 @@
884888
"7922608408": "https://devtools-registry.s3.yandex.net/7922608408",
885889
"7949052736": "https://devtools-registry.s3.yandex.net/7949052736",
886890
"8000012216": "https://devtools-registry.s3.yandex.net/8000012216",
891+
"8069586009": "https://devtools-registry.s3.yandex.net/8069586009",
887892
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
888893
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
889894
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -949,6 +954,7 @@
949954
"7922610123": "https://devtools-registry.s3.yandex.net/7922610123",
950955
"7949054892": "https://devtools-registry.s3.yandex.net/7949054892",
951956
"8000014239": "https://devtools-registry.s3.yandex.net/8000014239",
957+
"8069588665": "https://devtools-registry.s3.yandex.net/8069588665",
952958
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
953959
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
954960
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1592,7 +1598,6 @@
15921598
"5545691160": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15931599
"5559524010": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15941600
"5572005924": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1595-
"8018811524": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15961601
"5675381622": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15971602
"5683487438": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15981603
"5707396874": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
@@ -1730,7 +1735,9 @@
17301735
"7914217459": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17311736
"7948644946": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17321737
"7994647367": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1738+
"8018811524": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17331739
"8029671029": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1740+
"8067063302": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
17341741
"5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
17351742
"5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
17361743
"5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux",
@@ -1921,6 +1928,7 @@
19211928
"7922609627": "devtools/ymake/bin/ymake for darwin",
19221929
"7949054326": "devtools/ymake/bin/ymake for darwin",
19231930
"8000013577": "devtools/ymake/bin/ymake for darwin",
1931+
"8069587979": "devtools/ymake/bin/ymake for darwin",
19241932
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
19251933
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
19261934
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1986,6 +1994,7 @@
19861994
"7922609038": "devtools/ymake/bin/ymake for darwin-arm64",
19871995
"7949053519": "devtools/ymake/bin/ymake for darwin-arm64",
19881996
"8000012780": "devtools/ymake/bin/ymake for darwin-arm64",
1997+
"8069587058": "devtools/ymake/bin/ymake for darwin-arm64",
19891998
"5766173070": "devtools/ymake/bin/ymake for linux",
19901999
"5805432830": "devtools/ymake/bin/ymake for linux",
19912000
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -2051,6 +2060,7 @@
20512060
"7922610908": "devtools/ymake/bin/ymake for linux",
20522061
"7949055512": "devtools/ymake/bin/ymake for linux",
20532062
"8000014871": "devtools/ymake/bin/ymake for linux",
2063+
"8069590186": "devtools/ymake/bin/ymake for linux",
20542064
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
20552065
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
20562066
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -2116,6 +2126,7 @@
21162126
"7922608408": "devtools/ymake/bin/ymake for linux-aarch64",
21172127
"7949052736": "devtools/ymake/bin/ymake for linux-aarch64",
21182128
"8000012216": "devtools/ymake/bin/ymake for linux-aarch64",
2129+
"8069586009": "devtools/ymake/bin/ymake for linux-aarch64",
21192130
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
21202131
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
21212132
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -2181,6 +2192,7 @@
21812192
"7922610123": "devtools/ymake/bin/ymake for win32-clang-cl",
21822193
"7949054892": "devtools/ymake/bin/ymake for win32-clang-cl",
21832194
"8000014239": "devtools/ymake/bin/ymake for win32-clang-cl",
2195+
"8069588665": "devtools/ymake/bin/ymake for win32-clang-cl",
21842196
"4307890075": "flake8_linter for linux",
21852197
"5517245192": "flake8_linter for linux",
21862198
"4307901240": "flake8_linter for linux-aarch64",

‎build/platform/test_tool/host.ya.make.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029723475)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067054769)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029717949)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067052570)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029737034)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067059291)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029713125)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067050341)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029729848)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067056916)
1111

1212
ENDIF()

‎build/platform/test_tool/host_os.ya.make.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64)
2-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029664104)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067059819)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029660543)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067058189)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029671029)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067063302)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029657728)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067056908)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8029667517)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8067061637)
1111

1212
ENDIF()

‎build/platform/yfm/ya.make

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ ENDIF()
66

77
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
88
YFM_TOOL
9-
sbr:8013150302 FOR DARWIN-ARM64
10-
sbr:8013150302 FOR DARWIN
11-
sbr:8013116004 FOR LINUX
12-
sbr:8013130168 FOR WIN32
9+
sbr:8080019710 FOR DARWIN-ARM64
10+
sbr:8080019710 FOR DARWIN
11+
sbr:8079953250 FOR LINUX
12+
sbr:8079956183 FOR WIN32
1313
)
1414

1515
END()

‎build/scripts/link_dyn_lib.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,17 +187,6 @@ def fix_cmd_for_dynamic_cuda(cmd):
187187
return flags
188188

189189

190-
def fix_blas_resolving(cmd):
191-
# Intel mkl comes as a precompiled static library and thus can not be recompiled with sanitizer runtime instrumentation.
192-
# That's why we prefer to use cblas instead of Intel mkl as a drop-in replacement under sanitizers.
193-
# But if the library has dependencies on mkl and cblas simultaneously, it will get a linking error.
194-
# Hence we assume that it's probably compiling without sanitizers and we can easily remove cblas to prevent multiple definitions of the same symbol at link time.
195-
for arg in cmd:
196-
if arg.startswith('contrib/libs') and arg.endswith('mkl-lp64.a'):
197-
return [arg for arg in cmd if not arg.endswith('libcontrib-libs-cblas.a')]
198-
return cmd
199-
200-
201190
def parse_args(args):
202191
parser = optparse.OptionParser()
203192
parser.disable_interspersed_args()
@@ -242,7 +231,7 @@ def parse_args(args):
242231
assert opts.arch
243232
assert opts.target
244233

245-
cmd = fix_blas_resolving(args)
234+
cmd = args
246235
cmd = fix_cmd(opts.arch, cmd)
247236

248237
if opts.dynamic_cuda:

‎build/scripts/link_exe.py

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -299,17 +299,6 @@ def gen_default_suppressions(inputs, output, source_root):
299299
dst.write('}\n')
300300

301301

302-
def fix_blas_resolving(cmd):
303-
# Intel mkl comes as a precompiled static library and thus can not be recompiled with sanitizer runtime instrumentation.
304-
# That's why we prefer to use cblas instead of Intel mkl as a drop-in replacement under sanitizers.
305-
# But if the library has dependencies on mkl and cblas simultaneously, it will get a linking error.
306-
# Hence we assume that it's probably compiling without sanitizers and we can easily remove cblas to prevent multiple definitions of the same symbol at link time.
307-
for arg in cmd:
308-
if arg.startswith('contrib/libs') and arg.endswith('mkl-lp64.a'):
309-
return [arg for arg in cmd if not arg.endswith('libcontrib-libs-cblas.a')]
310-
return cmd
311-
312-
313302
def parse_args(args):
314303
parser = optparse.OptionParser()
315304
parser.disable_interspersed_args()
@@ -351,7 +340,7 @@ def parse_args(args):
351340
opts, args = parse_args(args)
352341
args = pcf.skip_markers(args)
353342

354-
cmd = fix_blas_resolving(args)
343+
cmd = args
355344
cmd = remove_excessive_flags(cmd)
356345
cmd = fix_sanitize_flag(cmd, opts)
357346

‎build/sysincl/macro.yml

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1211,34 +1211,6 @@
12111211
includes:
12121212
- SDBUS_HEADER: contrib/libs/systemd/src/systemd/sd-bus.h
12131213

1214-
- source_filter: "^smart_devices/third_party/beken_freertos_sdk"
1215-
includes:
1216-
- LWIP_ERRNO_INCLUDE: smart_devices/third_party/beken_freertos_sdk/beken378/func/lwip_intf/lwip-2.1.2/src/include/lwip/errno.h
1217-
- LWIP_HOOK_FILENAME
1218-
- DHCP_GLOBAL_XID_HEADER
1219-
- MBEDTLS_CONFIG_FILE: smart_devices/third_party/beken_freertos_sdk/beken378/func/mbedtls/mbedtls-port/inc/aws_mbedtls_config.h
1220-
- MBEDTLS_USER_CONFIG_FILE
1221-
- MBEDTLS_PLATFORM_STD_MEM_HDR
1222-
- YOTTA_CFG_MBEDTLS_TARGET_CONFIG_FILE
1223-
- YOTTA_CFG_MBEDTLS_USER_CONFIG_FILE
1224-
- xstr(MQTTCLIENT_PLATFORM_HEADER)
1225-
12261214
- source_filter: "^contrib/libs/openthread"
12271215
includes:
12281216
- OPENTHREAD_CONFIG_FILE
1229-
1230-
- source_filter: "^smart_devices/platforms/yandexmidi/zigbee/firmware/ncp"
1231-
includes:
1232-
- EMBER_AF_API_EMBER_TYPES: smart_devices/third_party/gecko_sdk/protocol/zigbee/stack/include/ember-types.h
1233-
- EMBER_AF_API_EZSP: smart_devices/third_party/gecko_sdk/protocol/zigbee/app/em260/command-context.h
1234-
- EMBER_AF_API_NEIGHBOR_HEADER: smart_devices/third_party/gecko_sdk/protocol/zigbee/stack/include/stack-info.h
1235-
- EMBER_AF_API_MFGLIB: smart_devices/third_party/gecko_sdk/protocol/zigbee/stack/include/mfglib.h
1236-
- EMBER_AF_API_CBKE: smart_devices/third_party/gecko_sdk/protocol/zigbee/stack/include/cbke-crypto-engine.h
1237-
- EMBER_AF_API_NVM3: smart_devices/third_party/gecko_sdk/platform/base/hal/plugin/nvm3/nvm3-token.h
1238-
- EMBER_AF_API_ZIGBEE_PRO: smart_devices/third_party/gecko_sdk/protocol/zigbee/stack/include/ember.h
1239-
- EMBER_AF_API_STACK: smart_devices/third_party/gecko_sdk/protocol/zigbee/stack/include/ember.h
1240-
1241-
- source_filter: "^smart_devices/third_party/gecko_sdk"
1242-
includes:
1243-
- SL_RAIL_UTIL_PA_CURVE_HEADER: smart_devices/third_party/gecko_sdk/platform/radio/rail_lib/plugin/pa-conversions/pa_curves_efr32.h
1244-
- SL_RAIL_UTIL_PA_CURVE_TYPES: smart_devices/third_party/gecko_sdk/platform/radio/rail_lib/plugin/pa-conversions/pa_curve_types_efr32.h

‎build/sysincl/misc.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -459,14 +459,6 @@
459459
- vendor/github.com/NVIDIA/go-nvml/gen/nvml/nvml.h
460460
- vendor/github.com/NVIDIA/go-nvml/pkg/nvml/nvml.h
461461

462-
- source_filter: "^smart_devices/third_party/beken_freertos_sdk"
463-
includes:
464-
- error.h: smart_devices/third_party/beken_freertos_sdk/beken378/common/error.h
465-
- errno.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/lwip_intf/lwip-2.1.2/src/include/lwip/errno.h
466-
- netdb.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/lwip_intf/lwip-2.1.2/src/include/lwip/netdb.h
467-
- signal.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/wpa_supplicant_2_9/bk_patch/signal.h
468-
- check_config.h: smart_devices/third_party/beken_freertos_sdk/beken378/func/mbedtls/mbedtls-2.27.0/include/mbedtls/check_config.h
469-
470462
- source_filter: "^contrib/libs/svt-av1"
471463
includes:
472464
- filter.h: contrib/libs/svt-av1/Source/Lib/Codec/filter.h

0 commit comments

Comments
 (0)