Skip to content

Commit 28180f6

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #14512 from ydb-platform/merge-libs-250213-0050
2 parents 09744cf + 3616198 commit 28180f6

File tree

263 files changed

+4089
-2352
lines changed

Some content is hidden

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

263 files changed

+4089
-2352
lines changed

‎build/conf/licenses.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"AFL-2.0",
55
"Amazon-SL",
66
"APSL-1.0",
7-
"Artistic-2.0",
87
"ASM-BSD-3-Clause",
98
"BCL",
109
"Bison-Exception",
@@ -39,7 +38,6 @@
3938
"CC-BY-SA-4.0",
4039
"CDDL",
4140
"CECILL-B",
42-
"ClArtistic",
4341
"DSO-1.1",
4442
"Elastic-License-2.0",
4543
"FSFUL",
@@ -159,6 +157,7 @@
159157
"AGPL-3.0-or-later",
160158
"Artistic-1.0",
161159
"Artistic-1.0-Perl",
160+
"ClArtistic",
162161
"confluent-community-1.0",
163162
"Moderne-Source-Available-License"
164163
]
@@ -180,6 +179,7 @@
180179
"Apache-2.0",
181180
"Apache-2.0 WITH LLVM-exception",
182181
"APSL-2.0",
182+
"Artistic-2.0",
183183
"Beerware",
184184
"blessing",
185185
"Brian-Gladman-3-Clause",
@@ -213,6 +213,7 @@
213213
"Cmu-Computing-Services",
214214
"CUP-Parser",
215215
"curl",
216+
"Custom-clarified-artistic-proofread",
216217
"Custom-eigen",
217218
"Custom-fft2d",
218219
"Custom-fft4g",

‎build/conf/linkers/ld.conf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -354,13 +354,6 @@ _LD_LINK_LIB_EXTRA_INPUT=
354354
_LD_TAIL_LINK_LIB=$AUTO_INPUT $_LD_LINK_LIB_EXTRA_INPUT ${hide;kv:"p AR"} $TOOLCHAIN_ENV ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
355355
_LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/link_lib.py"} ${quo:AR_TOOL} $AR_TYPE $_LD_LLVM_AR_FORMAT $ARCADIA_BUILD_ROOT $_LD_AR_PLUGIN -- $_LD_ARCHIVER_KV_PLUGIN --
356356

357-
when ($MAPSMOBI_BUILD_TARGET == "yes") {
358-
_LD_ARCHIVER+= "no-openssl3"
359-
}
360-
otherwise {
361-
_LD_ARCHIVER+= "enable-openssl3"
362-
}
363-
364357
_LD_LIB_GENERATE_MF=$GENERATE_MF &&
365358
when ($TIDY == "yes") {
366359
_LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/clang_tidy_arch.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --output-file

‎build/export_generators/cmake/build/scripts/create_recursive_library_for_cmake.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,8 @@ def __init__(self, opts):
145145
'gnu', # llvm_ar_format, used only if arch_type == 'LLVM_AR'
146146
opts.parsed_args.project_binary_dir,
147147
'None', # plugin. Unused for now
148+
'--', # for plugins. Unused for now
149+
'--',
148150
]
149151
# the remaining archiving cmd args are [output, .. input .. ]
150152

‎build/export_generators/cmake/generator.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,12 +209,12 @@ copy=["cmake/FindJNITarget.cmake"]
209209
add_values=[{attr="includes", values=["cmake/FindJNITarget.cmake"]}]
210210

211211
[[rules]]
212-
attrs=["target_commands-macro=run_antlr"]
212+
attrs=["custom_runs-command=run_antlr"]
213213
copy=["cmake/antlr.cmake"]
214214
add_values=[{attr="includes", values=["cmake/antlr.cmake"]}]
215215

216216
[[rules]]
217-
attrs=["target_commands-macro=run_antlr4"]
217+
attrs=["custom_runs-command=run_antlr4"]
218218
copy=["cmake/antlr4.cmake"]
219219
add_values=[{attr="includes", values=["cmake/antlr4.cmake"]}]
220220

‎build/export_generators/cmake/target_commands.jinja

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
{%- if current_target.custom_runs|length -%}
2222
{%- for custom_run in current_target.custom_runs %}
2323
{%- set first_arg = custom_run.command|first %}
24-
{%- set tail_args = custom_run.command|slice(1, custom_run.command|length - 1) %}
2524
{%- if (first_arg == "run_antlr") or (first_arg == "run_antlr4") %}
2625
{{ first_arg }}(
2726
{%- if custom_run.outputs|length %}
@@ -34,14 +33,16 @@
3433
WORKING_DIRECTORY
3534
{{ custom_run.cwd }}
3635
{%- endif -%}
37-
{%- if tail_args|length %}
38-
ANTLR_ARGS
39-
{%- for tail_arg in tail_args %}
40-
{{ tail_arg }}
36+
{%- if custom_run.command|length > 1 %}
37+
ANTLER_ARGS
38+
{%- for arg in custom_run.command -%}
39+
{%- if not loop.first %}
40+
{{ arg }}
41+
{%- endif -%}
4142
{%- endfor -%}
42-
{%- endif -%}
43+
{%- endif %}
4344
)
44-
{%- else %}
45+
{% else %}
4546
add_custom_command(
4647
{%- if custom_run.outputs|length %}
4748
OUTPUT

‎build/mapping.conf.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"bottles": {},
33
"resources": {
4+
"8018811524": "https://devtools-registry.s3.yandex.net/8018811524",
45
"6277415836": "https://devtools-registry.s3.yandex.net/6277415836",
56
"2214720943": "https://devtools-registry.s3.yandex.net/2214720943",
67
"2214542408": "https://devtools-registry.s3.yandex.net/2214542408",
@@ -1065,8 +1066,11 @@
10651066
"7512103615": "https://devtools-registry.s3.yandex.net/7512103615",
10661067
"7324464594": "https://devtools-registry.s3.yandex.net/7324464594",
10671068
"7654921682": "https://devtools-registry.s3.yandex.net/7654921682",
1069+
"8013116004": "https://devtools-registry.s3.yandex.net/8013116004",
1070+
"8013130168": "https://devtools-registry.s3.yandex.net/8013130168",
10681071
"7487656957": "https://devtools-registry.s3.yandex.net/7487656957",
10691072
"7458707245": "https://devtools-registry.s3.yandex.net/7458707245",
1073+
"8013150302": "https://devtools-registry.s3.yandex.net/8013150302",
10701074
"7414146467": "https://devtools-registry.s3.yandex.net/7414146467",
10711075
"7654793679": "https://devtools-registry.s3.yandex.net/7654793679",
10721076
"7487672728": "https://devtools-registry.s3.yandex.net/7487672728",
@@ -1587,6 +1591,7 @@
15871591
"5545691160": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15881592
"5559524010": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15891593
"5572005924": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
1594+
"8018811524": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15901595
"5675381622": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15911596
"5683487438": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
15921597
"5707396874": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
@@ -2292,8 +2297,11 @@
22922297
"7512103615": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/29fcd2aa-e0b5-481e-83c8-b7ff5e0157c9/yfm-docs.tar",
22932298
"7324464594": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/32cc8c74-decd-44a8-bc8c-f8f0d7edfffe/yfm-docs.tar",
22942299
"7654921682": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/33b2cf15-eb2e-44b8-a074-0c6f60f97a04/yfm-docs.tar",
2300+
"8013116004": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/33d7c3cf-e76f-40cb-9e98-59084b60928c/yfm-docs.tar",
2301+
"8013130168": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/47070d89-f0a5-4aed-a017-3bd4f9d1518f/yfm-docs.tar",
22952302
"7487656957": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/4b747fb6-2d4e-4a7b-bbed-abb9a1e21761/yfm-docs.tar",
22962303
"7458707245": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/4e7df89f-3762-4eba-ba73-562ccaeae548/yfm-docs.tar",
2304+
"8013150302": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/5af5fdb2-854a-4889-8d34-beb85f4a7c30/yfm-docs.tar",
22972305
"7414146467": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/66167d72-07fa-444c-8493-dea0a39d034e/yfm-docs.tar",
22982306
"7654793679": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/68b3d50f-8068-40b2-8e3c-96653135fcb5/yfm-docs.tar",
22992307
"7487672728": "none-none-none-service_resources/TASKLET_EXECUTABLE/backup/68c62602-dfe7-4bea-873f-cae85e13071f/yfm-docs.tar",

‎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:7994789266)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018525488)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994784587)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018523316)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994797288)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018529985)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994780427)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018521599)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994793586)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018527620)
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:7994642530)
2+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018808572)
33
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
4-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994640050)
4+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018807025)
55
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
6-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994647367)
6+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018811524)
77
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
8-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994637838)
8+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018805118)
99
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
10-
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7994644702)
10+
DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:8018809911)
1111

1212
ENDIF()

‎build/plugins/_common.py

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import six
2-
import sys
32
import hashlib
43
import base64
54

@@ -61,15 +60,6 @@ def tobuilddir(fname):
6160
return fname
6261

6362

64-
def before(s, ss):
65-
p = s.find(ss)
66-
67-
if p == -1:
68-
return s
69-
70-
return s[:p]
71-
72-
7363
def sort_by_keywords(keywords, args):
7464
flat = []
7565
res = {}
@@ -115,30 +105,10 @@ def resolve_common_const(path):
115105
return path
116106

117107

118-
def resolve_to_abs_path(path, source_root, build_root):
119-
if path.startswith('$S') and source_root is not None:
120-
return path.replace('$S', source_root, 1)
121-
if path.startswith('$B') and build_root is not None:
122-
return path.replace('$B', build_root, 1)
123-
return path
124-
125-
126-
def resolve_to_ymake_path(path):
127-
return resolve_to_abs_path(path, '${ARCADIA_ROOT}', '${ARCADIA_BUILD_ROOT}')
128-
129-
130108
def get(fun, num):
131109
return fun()[num][0]
132110

133111

134-
def make_tuples(arg_list):
135-
def tpl():
136-
for x in arg_list:
137-
yield (x, [])
138-
139-
return list(tpl())
140-
141-
142112
def resolve_includes(unit, src, paths):
143113
return unit.resolve_include([src] + paths) if paths else []
144114

@@ -169,13 +139,6 @@ def skip_build_root(x):
169139
return x
170140

171141

172-
def get_interpreter_path():
173-
interpreter_path = [sys.executable]
174-
if 'ymake' in interpreter_path[0]:
175-
interpreter_path.append('--python')
176-
return interpreter_path
177-
178-
179142
def filter_out_by_keyword(test_data, keyword):
180143
def _iterate():
181144
i = 0

‎build/plugins/nots.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from enum import auto, StrEnum
33
from typing import Any, Literal, TYPE_CHECKING
44

5+
56
# noinspection PyUnresolvedReferences
67
import ymake
78

‎build/scripts/link_exe.py

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ def get_leaks_suppressions(cmd):
2727
return supp, newcmd
2828

2929

30-
MUSL_LIBS = '-lc', '-lcrypt', '-ldl', '-lm', '-lpthread', '-lrt', '-lutil'
31-
32-
3330
CUDA_LIBRARIES = {
3431
'-lcublas_static': '-lcublas',
3532
'-lcublasLt_static': '-lcublasLt',
@@ -258,14 +255,6 @@ def fix_sanitize_flag(cmd, opts):
258255
return flags
259256

260257

261-
def fix_cmd_for_musl(cmd):
262-
flags = []
263-
for flag in cmd:
264-
if flag not in MUSL_LIBS:
265-
flags.append(flag)
266-
return flags
267-
268-
269258
def fix_cmd_for_dynamic_cuda(cmd):
270259
flags = []
271260
for flag in cmd:
@@ -325,7 +314,6 @@ def fix_blas_resolving(cmd):
325314
def parse_args(args):
326315
parser = optparse.OptionParser()
327316
parser.disable_interspersed_args()
328-
parser.add_option('--musl', action='store_true')
329317
parser.add_option('--custom-step')
330318
parser.add_option('--python')
331319
parser.add_option('--source-root')
@@ -364,9 +352,6 @@ def parse_args(args):
364352
cmd = fix_blas_resolving(args)
365353
cmd = fix_py2(cmd)
366354
cmd = remove_excessive_flags(cmd)
367-
if opts.musl:
368-
cmd = fix_cmd_for_musl(cmd)
369-
370355
cmd = fix_sanitize_flag(cmd, opts)
371356

372357
if opts.dynamic_cuda:

‎build/scripts/link_lib.py

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ def __init__(self, args):
2525
self.llvm_ar_format = args[2]
2626
self.build_root = args[3]
2727
self.plugin = args[4]
28-
self.enable_openssl3 = args[5]
29-
self.output = args[6]
30-
auto_input = args[7:]
28+
self.output = args[5]
29+
auto_input = args[6:]
3130

3231
self.need_modify = False
3332
self.extra_args = []
@@ -66,68 +65,6 @@ def get_opts(args):
6665
return Opts(args)
6766

6867

69-
def run(*args):
70-
return subprocess.check_output(list(args), shell=False).strip()
71-
72-
73-
def gen_renames_1(d):
74-
for l in d.split('\n'):
75-
l = l.strip()
76-
77-
if ' ' in l:
78-
yield l.split(' ')[-1]
79-
80-
81-
def have_prefix(l, p):
82-
for x in l:
83-
if not x.startswith(p):
84-
return False
85-
86-
return True
87-
88-
89-
def gen_renames_2(p, d):
90-
l = list(gen_renames_1(d))
91-
a = have_prefix(l, '_')
92-
93-
for s in l:
94-
if 'asan_globals' in s:
95-
continue
96-
97-
if s in ['HMAC', 'SHA1', 'SHA256', 'SHA256', 'SHA512', 'RC4', 'MD5', 'SHA384']:
98-
continue
99-
100-
if a and s[1:] in ['HMAC', 'SHA1', 'SHA256', 'SHA256', 'SHA512', 'RC4', 'MD5', 'SHA384']:
101-
continue
102-
103-
if a:
104-
yield s + ' _' + p + s[1:]
105-
else:
106-
yield s + ' ' + p + s
107-
108-
109-
def gen_renames(p, d):
110-
return '\n'.join(gen_renames_2(p, d)).strip() + '\n'
111-
112-
113-
def rename_syms(where, ret):
114-
p = 'v1_'
115-
116-
# find symbols to rename
117-
syms = run(where + 'llvm-nm', '--extern-only', '--defined-only', '-A', ret)
118-
119-
# prepare rename plan
120-
renames = gen_renames(p, syms)
121-
tmp = ret + '.syms'
122-
123-
with open(tmp, 'w') as f:
124-
f.write(renames)
125-
126-
# rename symbols
127-
run(where + 'llvm-objcopy', '--redefine-syms=' + tmp, ret)
128-
os.unlink(tmp)
129-
130-
13168
if __name__ == "__main__":
13269
opts = get_opts(sys.argv[1:])
13370

@@ -176,8 +113,5 @@ def call():
176113
if exit_code != 0:
177114
raise Exception('{0} returned non-zero exit code {1}. Stop.'.format(' '.join(cmd), exit_code))
178115

179-
if opts.enable_openssl3 != 'no-openssl3' and os.path.basename(opts.output) in ['libcontrib-libs-openssl.a', 'liblibs-openssl-crypto.a']:
180-
rename_syms(os.path.dirname(opts.archiver) + '/', opts.output)
181-
182116
if opts.ar_plugin:
183117
subprocess.check_call([sys.executable, opts.ar_plugin, opts.output, '--'] + sys.argv[1:])

0 commit comments

Comments
 (0)