diff options
author | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
---|---|---|
committer | Alexander Smirnov <alex@ydb.tech> | 2024-10-16 12:11:24 +0000 |
commit | 40811e93f3fdf9342a9295369994012420fac548 (patch) | |
tree | a8d85e094a9c21e10aa250f537c101fc2016a049 /build | |
parent | 30ebe5357bb143648c6be4d151ecd4944af81ada (diff) | |
parent | 28a0c4a9f297064538a018c512cd9bbd00a1a35d (diff) | |
download | ydb-40811e93f3fdf9342a9295369994012420fac548.tar.gz |
Merge branch 'rightlib' into mergelibs-241016-1210
Diffstat (limited to 'build')
-rw-r--r-- | build/conf/java.conf | 6 | ||||
-rw-r--r-- | build/conf/linkers/ld.conf | 3 | ||||
-rw-r--r-- | build/external_resources/ymake/public.resources.json | 10 | ||||
-rw-r--r-- | build/external_resources/ymake/resources.json | 10 | ||||
-rw-r--r-- | build/mapping.conf.json | 28 | ||||
-rw-r--r-- | build/platform/lld/ya.make | 16 | ||||
-rw-r--r-- | build/platform/test_tool/host.ya.make.inc | 10 | ||||
-rw-r--r-- | build/platform/test_tool/host_os.ya.make.inc | 10 | ||||
-rw-r--r-- | build/plugins/_dart_fields.py | 25 | ||||
-rw-r--r-- | build/plugins/java.py | 2 | ||||
-rw-r--r-- | build/sysincl/libc-to-compat.yml | 1 | ||||
-rw-r--r-- | build/sysincl/misc.yml | 8 | ||||
-rw-r--r-- | build/sysincl/stl-to-nothing.yml | 3 | ||||
-rw-r--r-- | build/ya.conf.json | 10 | ||||
-rw-r--r-- | build/ymake.core.conf | 2 |
15 files changed, 84 insertions, 60 deletions
diff --git a/build/conf/java.conf b/build/conf/java.conf index 5dc361a3b1..e39b34818e 100644 --- a/build/conf/java.conf +++ b/build/conf/java.conf @@ -1833,12 +1833,6 @@ MANAGED_PEERS_CLOSURE= MANAGEABLE_PEERS_ROOTS=contrib/java HAS_MANAGEABLE_PEERS=no PROPAGATES_MANAGEABLE_PEERS=no -# All items of this list must be PEERS, GHOST PEERS or TOOLS of the test module or module itself. -# All items of this list must has at least one of HAS_MANAGEABLE_PEERS or PROPAGATES_MANAGEABLE_PEERS flags set yes. -# This variable is used by JUnit tests but not TestNG. -TEST_CLASSPATH_VALUE= -# Calculated and replaced by ymake can be used in DART DATA -TEST_CLASSPATH_MANAGED= # tag:java-specific DEPENDENCY_MANAGEMENT_VALUE= diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index d7c63cf4df..afaaa1cb42 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -294,6 +294,7 @@ DWARF_COMMAND=$_DWARF_COMMAND _REAL_LINK_EXE=$REAL_LINK_EXE_IMPL($_WHOLE_ARCHIVE_PEERS_VALUE) _EXTRA_OBJS= _GENERATE_EXTRA_OBJS= +_EXTRA_LINK_CMD= _LINK_EXE= _LINK_EXE+=$GENERATE_MF @@ -304,6 +305,7 @@ _LINK_EXE+=&& $REAL_LINK_EXE _LINK_EXE+=&& $DWARF_COMMAND _LINK_EXE+=&& $LINK_ADDITIONAL_SECTIONS_COMMAND _LINK_EXE+=&& $PACK_IOS_CMD +_LINK_EXE+=&& $_EXTRA_LINK_CMD _LINK_DYN_LIB= _LINK_DYN_LIB+=$GENERATE_MF @@ -313,6 +315,7 @@ _LINK_DYN_LIB+=&& $COPY_PROFILE_RUNTIME _LINK_DYN_LIB+=&& $REAL_LINK_DYN_LIB _LINK_DYN_LIB+=&& $DWARF_COMMAND _LINK_DYN_LIB+=&& $LINK_ADDITIONAL_SECTIONS_COMMAND +_LINK_DYN_LIB+=&& $_EXTRA_LINK_CMD when ($TIDY == "yes") { _REAL_LINK_EXE=$REAL_LINK_EXE_TIDY diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json index a3147f2414..93d20b5650 100644 --- a/build/external_resources/ymake/public.resources.json +++ b/build/external_resources/ymake/public.resources.json @@ -1,19 +1,19 @@ { "by_platform": { "darwin": { - "uri": "sbr:7211385890" + "uri": "sbr:7255221832" }, "darwin-arm64": { - "uri": "sbr:7211384971" + "uri": "sbr:7255220942" }, "linux": { - "uri": "sbr:7211387031" + "uri": "sbr:7255223649" }, "linux-aarch64": { - "uri": "sbr:7211384106" + "uri": "sbr:7255220285" }, "win32-clang-cl": { - "uri": "sbr:7211386552" + "uri": "sbr:7255222862" } } } diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json index a78ff39f53..aec5a0de95 100644 --- a/build/external_resources/ymake/resources.json +++ b/build/external_resources/ymake/resources.json @@ -1,19 +1,19 @@ { "by_platform": { "darwin": { - "uri": "sbr:7211379592" + "uri": "sbr:7255220552" }, "darwin-arm64": { - "uri": "sbr:7211379140" + "uri": "sbr:7255219972" }, "linux": { - "uri": "sbr:7211380545" + "uri": "sbr:7255222128" }, "linux-aarch64": { - "uri": "sbr:7211378513" + "uri": "sbr:7255219168" }, "win32-clang-cl": { - "uri": "sbr:7211379980" + "uri": "sbr:7255221316" } } } diff --git a/build/mapping.conf.json b/build/mapping.conf.json index 33eb41b162..5522059b32 100644 --- a/build/mapping.conf.json +++ b/build/mapping.conf.json @@ -190,18 +190,23 @@ "5599878022": "https://devtools-registry.s3.yandex.net/5599878022", "6635026187": "https://devtools-registry.s3.yandex.net/6635026187", "6816406420": "https://devtools-registry.s3.yandex.net/6816406420", + "7257128993": "https://devtools-registry.s3.yandex.net/7257128993", "5599877541": "https://devtools-registry.s3.yandex.net/5599877541", "6635026071": "https://devtools-registry.s3.yandex.net/6635026071", "6816406079": "https://devtools-registry.s3.yandex.net/6816406079", + "7257127197": "https://devtools-registry.s3.yandex.net/7257127197", "5599878769": "https://devtools-registry.s3.yandex.net/5599878769", "6635026422": "https://devtools-registry.s3.yandex.net/6635026422", "6816407233": "https://devtools-registry.s3.yandex.net/6816407233", + "7257132940": "https://devtools-registry.s3.yandex.net/7257132940", "5599877008": "https://devtools-registry.s3.yandex.net/5599877008", "6635025898": "https://devtools-registry.s3.yandex.net/6635025898", "6816405372": "https://devtools-registry.s3.yandex.net/6816405372", + "7257125308": "https://devtools-registry.s3.yandex.net/7257125308", "5599878473": "https://devtools-registry.s3.yandex.net/5599878473", "6635026287": "https://devtools-registry.s3.yandex.net/6635026287", "6816406896": "https://devtools-registry.s3.yandex.net/6816406896", + "7257131047": "https://devtools-registry.s3.yandex.net/7257131047", "5841616607": "https://devtools-registry.s3.yandex.net/5841616607", "6255592114": "https://devtools-registry.s3.yandex.net/6255592114", "6607396810": "https://devtools-registry.s3.yandex.net/6607396810", @@ -409,6 +414,10 @@ "7203793573": "https://devtools-registry.s3.yandex.net/7203793573", "7214825617": "https://devtools-registry.s3.yandex.net/7214825617", "7214836038": "https://devtools-registry.s3.yandex.net/7214836038", + "7258648922": "https://devtools-registry.s3.yandex.net/7258648922", + "7258655189": "https://devtools-registry.s3.yandex.net/7258655189", + "7268412397": "https://devtools-registry.s3.yandex.net/7268412397", + "7268415538": "https://devtools-registry.s3.yandex.net/7268415538", "5486731632": "https://devtools-registry.s3.yandex.net/5486731632", "5514350352": "https://devtools-registry.s3.yandex.net/5514350352", "5514360398": "https://devtools-registry.s3.yandex.net/5514360398", @@ -565,6 +574,7 @@ "7157619813": "https://devtools-registry.s3.yandex.net/7157619813", "7167514017": "https://devtools-registry.s3.yandex.net/7167514017", "7211385890": "https://devtools-registry.s3.yandex.net/7211385890", + "7255221832": "https://devtools-registry.s3.yandex.net/7255221832", "5766171800": "https://devtools-registry.s3.yandex.net/5766171800", "5805430761": "https://devtools-registry.s3.yandex.net/5805430761", "5829025456": "https://devtools-registry.s3.yandex.net/5829025456", @@ -608,6 +618,7 @@ "7157617132": "https://devtools-registry.s3.yandex.net/7157617132", "7167513539": "https://devtools-registry.s3.yandex.net/7167513539", "7211384971": "https://devtools-registry.s3.yandex.net/7211384971", + "7255220942": "https://devtools-registry.s3.yandex.net/7255220942", "5766173070": "https://devtools-registry.s3.yandex.net/5766173070", "5805432830": "https://devtools-registry.s3.yandex.net/5805432830", "5829031598": "https://devtools-registry.s3.yandex.net/5829031598", @@ -651,6 +662,7 @@ "7157625186": "https://devtools-registry.s3.yandex.net/7157625186", "7167514830": "https://devtools-registry.s3.yandex.net/7167514830", "7211387031": "https://devtools-registry.s3.yandex.net/7211387031", + "7255223649": "https://devtools-registry.s3.yandex.net/7255223649", "5766171341": "https://devtools-registry.s3.yandex.net/5766171341", "5805430188": "https://devtools-registry.s3.yandex.net/5805430188", "5829023352": "https://devtools-registry.s3.yandex.net/5829023352", @@ -694,6 +706,7 @@ "7157614512": "https://devtools-registry.s3.yandex.net/7157614512", "7167513152": "https://devtools-registry.s3.yandex.net/7167513152", "7211384106": "https://devtools-registry.s3.yandex.net/7211384106", + "7255220285": "https://devtools-registry.s3.yandex.net/7255220285", "5766172695": "https://devtools-registry.s3.yandex.net/5766172695", "5805432230": "https://devtools-registry.s3.yandex.net/5805432230", "5829029743": "https://devtools-registry.s3.yandex.net/5829029743", @@ -737,6 +750,7 @@ "7157622599": "https://devtools-registry.s3.yandex.net/7157622599", "7167514469": "https://devtools-registry.s3.yandex.net/7167514469", "7211386552": "https://devtools-registry.s3.yandex.net/7211386552", + "7255222862": "https://devtools-registry.s3.yandex.net/7255222862", "4307890075": "https://devtools-registry.s3.yandex.net/4307890075", "5517245192": "https://devtools-registry.s3.yandex.net/5517245192", "4307901240": "https://devtools-registry.s3.yandex.net/4307901240", @@ -1111,18 +1125,23 @@ "5599878022": "contrib/python/black/bin/black for darwin", "6635026187": "contrib/python/black/bin/black for darwin", "6816406420": "contrib/python/black/bin/black for darwin", + "7257128993": "contrib/python/black/bin/black for darwin", "5599877541": "contrib/python/black/bin/black for darwin-arm64", "6635026071": "contrib/python/black/bin/black for darwin-arm64", "6816406079": "contrib/python/black/bin/black for darwin-arm64", + "7257127197": "contrib/python/black/bin/black for darwin-arm64", "5599878769": "contrib/python/black/bin/black for linux", "6635026422": "contrib/python/black/bin/black for linux", "6816407233": "contrib/python/black/bin/black for linux", + "7257132940": "contrib/python/black/bin/black for linux", "5599877008": "contrib/python/black/bin/black for linux-aarch64", "6635025898": "contrib/python/black/bin/black for linux-aarch64", "6816405372": "contrib/python/black/bin/black for linux-aarch64", + "7257125308": "contrib/python/black/bin/black for linux-aarch64", "5599878473": "contrib/python/black/bin/black for win32", "6635026287": "contrib/python/black/bin/black for win32", "6816406896": "contrib/python/black/bin/black for win32", + "7257131047": "contrib/python/black/bin/black for win32", "5841616607": "contrib/tools/protoc/bin/protoc for linux", "6255592114": "contrib/tools/python3/bin/python3 for darwin", "6607396810": "contrib/tools/python3/bin/python3 for darwin", @@ -1330,6 +1349,10 @@ "7203793573": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", "7214825617": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", "7214836038": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", + "7258648922": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", + "7258655189": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", + "7268412397": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", + "7268415538": "devtools/ya/test/programs/test_tool/bin/test_tool for linux", "5486731632": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux", "5514350352": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux", "5514360398": "devtools/ya/test/programs/test_tool/bin3/test_tool3 for linux", @@ -1486,6 +1509,7 @@ "7157619813": "devtools/ymake/bin/ymake for darwin", "7167514017": "devtools/ymake/bin/ymake for darwin", "7211385890": "devtools/ymake/bin/ymake for darwin", + "7255221832": "devtools/ymake/bin/ymake for darwin", "5766171800": "devtools/ymake/bin/ymake for darwin-arm64", "5805430761": "devtools/ymake/bin/ymake for darwin-arm64", "5829025456": "devtools/ymake/bin/ymake for darwin-arm64", @@ -1529,6 +1553,7 @@ "7157617132": "devtools/ymake/bin/ymake for darwin-arm64", "7167513539": "devtools/ymake/bin/ymake for darwin-arm64", "7211384971": "devtools/ymake/bin/ymake for darwin-arm64", + "7255220942": "devtools/ymake/bin/ymake for darwin-arm64", "5766173070": "devtools/ymake/bin/ymake for linux", "5805432830": "devtools/ymake/bin/ymake for linux", "5829031598": "devtools/ymake/bin/ymake for linux", @@ -1572,6 +1597,7 @@ "7157625186": "devtools/ymake/bin/ymake for linux", "7167514830": "devtools/ymake/bin/ymake for linux", "7211387031": "devtools/ymake/bin/ymake for linux", + "7255223649": "devtools/ymake/bin/ymake for linux", "5766171341": "devtools/ymake/bin/ymake for linux-aarch64", "5805430188": "devtools/ymake/bin/ymake for linux-aarch64", "5829023352": "devtools/ymake/bin/ymake for linux-aarch64", @@ -1615,6 +1641,7 @@ "7157614512": "devtools/ymake/bin/ymake for linux-aarch64", "7167513152": "devtools/ymake/bin/ymake for linux-aarch64", "7211384106": "devtools/ymake/bin/ymake for linux-aarch64", + "7255220285": "devtools/ymake/bin/ymake for linux-aarch64", "5766172695": "devtools/ymake/bin/ymake for win32-clang-cl", "5805432230": "devtools/ymake/bin/ymake for win32-clang-cl", "5829029743": "devtools/ymake/bin/ymake for win32-clang-cl", @@ -1658,6 +1685,7 @@ "7157622599": "devtools/ymake/bin/ymake for win32-clang-cl", "7167514469": "devtools/ymake/bin/ymake for win32-clang-cl", "7211386552": "devtools/ymake/bin/ymake for win32-clang-cl", + "7255222862": "devtools/ymake/bin/ymake for win32-clang-cl", "4307890075": "flake8_linter for linux", "5517245192": "flake8_linter for linux", "4307901240": "flake8_linter for linux-aarch64", diff --git a/build/platform/lld/ya.make b/build/platform/lld/ya.make index b3459211f2..3b8902f650 100644 --- a/build/platform/lld/ya.make +++ b/build/platform/lld/ya.make @@ -44,18 +44,10 @@ ELSEIF (OS_LINUX) -Wl,--build-id=sha1 ) ELSEIF (OS_DARWIN OR OS_IOS) - IF (MAPSMOBI_BUILD_TARGET AND XCODE) - LDFLAGS( - -fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld64.lld - ) - ELSE() - LDFLAGS( - -fuse-ld=lld - --ld-path=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld64.lld - # FIXME: Remove fake linker version flag when clang 16 version arrives - -mlinker-version=705 - ) - ENDIF() + LDFLAGS( + -fuse-ld=lld + --ld-path=${LLD_ROOT_RESOURCE_GLOBAL}/bin/ld64.lld + ) ELSEIF (OS_EMSCRIPTEN) LDFLAGS( -fuse-ld=${LLD_ROOT_RESOURCE_GLOBAL}/bin/wasm-ld diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc index 5b321b291d..33747e51fd 100644 --- a/build/platform/test_tool/host.ya.make.inc +++ b/build/platform/test_tool/host.ya.make.inc @@ -1,12 +1,12 @@ IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835716) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268414015) ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835475) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268412855) ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214836038) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268415538) ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835148) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268411722) ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214835884) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268414733) ENDIF() diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc index 48c2363588..5c8418f65d 100644 --- a/build/platform/test_tool/host_os.ya.make.inc +++ b/build/platform/test_tool/host_os.ya.make.inc @@ -1,12 +1,12 @@ IF (HOST_OS_DARWIN AND HOST_ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214824944) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268408068) ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214824429) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268405912) ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214825617) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268412397) ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214823934) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268404402) ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64) - DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7214825382) + DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268410113) ENDIF() diff --git a/build/plugins/_dart_fields.py b/build/plugins/_dart_fields.py index 34f13579a2..2b556e2073 100644 --- a/build/plugins/_dart_fields.py +++ b/build/plugins/_dart_fields.py @@ -31,7 +31,14 @@ class DartValueError(ValueError): def create_dart_record(fields, *args): - return reduce(operator.or_, (value for field in fields if (value := field(*args))), {}) + try: + return reduce(operator.or_, (value for field in fields if (value := field(*args))), {}) + except Exception as e: + if str(e) != "": + ymake.report_configure_error("Exception: {}".format(e)) + else: + raise (e) + return None def with_fields(fields): @@ -840,12 +847,8 @@ class TestClasspath: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' - if test_classpath_origins: - value = '${TEST_CLASSPATH_MANAGED}' - return {cls.KEY: value} - elif ymake_java_test: + if ymake_java_test: value = '${DART_CLASSPATH}' return {cls.KEY: value} @@ -855,9 +858,8 @@ class TestClasspathDeps: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' - if not test_classpath_origins and ymake_java_test: + if ymake_java_test: return {cls.KEY: '${DART_CLASSPATH_DEPS}'} @@ -866,9 +868,7 @@ class TestClasspathOrigins: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') - if test_classpath_origins: - return {cls.KEY: test_classpath_origins} + return None class TestCwd: @@ -1227,9 +1227,8 @@ class TestJar: @classmethod def value(cls, unit, flat_args, spec_args): - test_classpath_origins = unit.get('TEST_CLASSPATH_VALUE') ymake_java_test = unit.get('YMAKE_JAVA_TEST') == 'yes' - if not test_classpath_origins and ymake_java_test: + if ymake_java_test: if unit.get('UNITTEST_DIR'): value = '${UNITTEST_MOD}' else: diff --git a/build/plugins/java.py b/build/plugins/java.py index b6565ce082..4b49fd8dac 100644 --- a/build/plugins/java.py +++ b/build/plugins/java.py @@ -68,7 +68,7 @@ def onjava_module(unit, *args): 'MANAGED_PEERS': '${MANAGED_PEERS}', 'MANAGED_PEERS_CLOSURE': '${MANAGED_PEERS_CLOSURE}', 'NON_NAMAGEABLE_PEERS': '${NON_NAMAGEABLE_PEERS}', - 'TEST_CLASSPATH_MANAGED': '${TEST_CLASSPATH_MANAGED}', + 'TEST_CLASSPATH_MANAGED': '', 'EXCLUDE': extract_macro_calls(unit, 'EXCLUDE_VALUE', args_delim), 'JAVA_SRCS': extract_macro_calls(unit, 'JAVA_SRCS_VALUE', args_delim), 'JAVAC_FLAGS': extract_macro_calls(unit, 'JAVAC_FLAGS_VALUE', args_delim), diff --git a/build/sysincl/libc-to-compat.yml b/build/sysincl/libc-to-compat.yml index 058a5e2176..7fc026c29d 100644 --- a/build/sysincl/libc-to-compat.yml +++ b/build/sysincl/libc-to-compat.yml @@ -2,6 +2,7 @@ - source_filter: "^(?!contrib/libs/musl).*|^contrib/libs/musl/tests" includes: - ifaddrs.h: contrib/libs/libc_compat/include/ifaddrs/ifaddrs.h + - sys/mman.h: "contrib/libs/libc_compat/memfd_create/sys/mman.h" - sys/random.h: "contrib/libs/libc_compat/random/sys/random.h" - readpassphrase.h: "contrib/libs/libc_compat/include/readpassphrase/readpassphrase.h" - stdlib.h: "contrib/libs/libc_compat/reallocarray/stdlib.h" diff --git a/build/sysincl/misc.yml b/build/sysincl/misc.yml index 19eef55002..98d7906993 100644 --- a/build/sysincl/misc.yml +++ b/build/sysincl/misc.yml @@ -45,6 +45,14 @@ - complex.h: contrib/libs/libm/include/complex.h - math.h: contrib/libs/libm/include/math.h +- source_filter: "^contrib/libs/jemalloc/" + includes: + - unwind.h: contrib/libs/libunwind/include/unwind.h + +- source_filter: "^contrib/libs/libunwind/" + includes: + - unwind.h: contrib/libs/libunwind/include/unwind.h + - source_filter: "^contrib/tools/bison/" includes: - error.h: contrib/tools/bison/lib/error.h diff --git a/build/sysincl/stl-to-nothing.yml b/build/sysincl/stl-to-nothing.yml index d5d33fad01..528ebdbc88 100644 --- a/build/sysincl/stl-to-nothing.yml +++ b/build/sysincl/stl-to-nothing.yml @@ -126,8 +126,7 @@ - variant - vector - version - - unwind.h: - - contrib/libs/libunwind/include/unwind.h + - unwind.h # Though these are headers provided by libcxx, we do not want to allow them to be included. diff --git a/build/ya.conf.json b/build/ya.conf.json index 3641ba3e10..a36158cf1f 100644 --- a/build/ya.conf.json +++ b/build/ya.conf.json @@ -39,19 +39,19 @@ "formula": { "by_platform": { "darwin-arm64": { - "uri": "sbr:6816406079" + "uri": "sbr:7257127197" }, "darwin-x86_64": { - "uri": "sbr:6816406420" + "uri": "sbr:7257128993" }, "linux-aarch64": { - "uri": "sbr:6816405372" + "uri": "sbr:7257125308" }, "linux-x86_64": { - "uri": "sbr:6816407233" + "uri": "sbr:7257132940" }, "win32-x86_64": { - "uri": "sbr:6816406896" + "uri": "sbr:7257131047" } } } diff --git a/build/ymake.core.conf b/build/ymake.core.conf index 6414f90d1e..b59168f2bc 100644 --- a/build/ymake.core.conf +++ b/build/ymake.core.conf @@ -1802,7 +1802,7 @@ module _LIBRARY: _BASE_UNIT { .STRUCT_CMD=yes .NODE_TYPE=Library .PEERDIR_POLICY=as_include - .EXTS=.o .obj .a .mf .supp .sbom .tidyjson .ld .lib + .EXTS=.o .obj .a .mf .supp .sbom .tidyjson .ld .lib .sdcmeta .ALLOWED=GRPC USE_SKIFF EXTRALIBS OBJADDE_GLOBAL RESOURCE_FILES .GLOBAL=USER_CFLAGS USER_CXXFLAGS USER_CONLYFLAGS LDFLAGS SRCS _WHOLE_ARCHIVE_LIBS_VALUE RPATH OBJADDE_LIB .RESTRICTED=ALLOCATOR SIZE TAG DATA TEST_DATA DEPENDS FORK_TESTS FORK_SUBTESTS SPLIT_FACTOR TEST_CWD RUN TIMEOUT SPLIT_DWARF |