aboutsummaryrefslogtreecommitdiffstats
path: root/build/platform
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2024-07-08 15:54:05 +0000
committerAlexander Smirnov <alex@ydb.tech>2024-07-08 15:54:05 +0000
commitfc7be18c76af2e700641f3598c4856baeef1428e (patch)
tree11dbca45eb321c3a4dd08b12152acc6ef5dd3fa9 /build/platform
parentec0e7ed6da6fb317741fd8468602949a1362eca5 (diff)
parentc92cb9d3a19331916f0c274d80e67f02a62caa9b (diff)
downloadydb-fc7be18c76af2e700641f3598c4856baeef1428e.tar.gz
Merge branch 'rightlib' into mergelibs-240708-1553
Diffstat (limited to 'build/platform')
-rw-r--r--build/platform/linux_sdk/ya.make2
-rw-r--r--build/platform/python/ymake_python3/resources.json10
-rw-r--r--build/platform/python/ymake_python3/ya.make3
-rw-r--r--build/platform/test_tool/host.ya.make.inc10
-rw-r--r--build/platform/test_tool/host_os.ya.make.inc10
5 files changed, 20 insertions, 15 deletions
diff --git a/build/platform/linux_sdk/ya.make b/build/platform/linux_sdk/ya.make
index 510c6247f5..87e09cb73b 100644
--- a/build/platform/linux_sdk/ya.make
+++ b/build/platform/linux_sdk/ya.make
@@ -27,6 +27,8 @@ ELSEIF (ARCH_X86_64)
ELSEIF (ARCH_AARCH64)
IF (OS_SDK == "ubuntu-16")
DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:309054781)
+ ELSEIF (OS_SDK == "ubuntu-20")
+ DECLARE_EXTERNAL_RESOURCE(OS_SDK_ROOT sbr:6601145959)
ELSE()
MESSAGE(FATAL_ERROR "There is no ${OS_SDK} SDK for AArch64/ARMv8 64 bit")
ENDIF()
diff --git a/build/platform/python/ymake_python3/resources.json b/build/platform/python/ymake_python3/resources.json
index 26f30d66f5..52a778554b 100644
--- a/build/platform/python/ymake_python3/resources.json
+++ b/build/platform/python/ymake_python3/resources.json
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
- "uri": "sbr:6255592114"
+ "uri": "sbr:6607396810"
},
"darwin-arm64": {
- "uri": "sbr:6255591964"
+ "uri": "sbr:6607396320"
},
"linux": {
- "uri": "sbr:6255592465"
+ "uri": "sbr:6607397946"
},
"linux-aarch64": {
- "uri": "sbr:6255592313"
+ "uri": "sbr:6607397279"
},
"win32": {
- "uri": "sbr:6255591839"
+ "uri": "sbr:6607395742"
}
}
}
diff --git a/build/platform/python/ymake_python3/ya.make b/build/platform/python/ymake_python3/ya.make
index 5067415444..9bf8814731 100644
--- a/build/platform/python/ymake_python3/ya.make
+++ b/build/platform/python/ymake_python3/ya.make
@@ -1,5 +1,8 @@
RESOURCES_LIBRARY()
+TOOLCHAIN(python3)
+VERSION(3.12.3)
+
NO_YMAKE_PYTHON3()
SET(RESOURCES_LIBRARY_LINK $TOUCH_UNIT)
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE_BY_JSON(YMAKE_PYTHON3 resources.json)
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index 439b5cd962..1d3230cc32 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:6523688078)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621510313)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523686672)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621509514)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523690593)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621511805)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523685259)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621508994)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523689284)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621510884)
ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index d60649da9d..320e83d6b3 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:6523719110)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621525291)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523717132)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621524448)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523723140)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621527332)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523715499)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621523598)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6523721033)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:6621526406)
ENDIF()