aboutsummaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorAlexander Smirnov <alex@ydb.tech>2024-10-21 10:21:33 +0000
committerAlexander Smirnov <alex@ydb.tech>2024-10-21 10:21:33 +0000
commit4eca37ecd81a80606e9c2afed5401f15d15e3671 (patch)
treeedb21b983f86981f8ed77704231cbe589bc19bdd /build
parent7f4d37b99e25e931918580a353dba7eed11407ee (diff)
parentd3ed30f2deefe6a5ed0d07a3018c723749ca5d7b (diff)
downloadydb-4eca37ecd81a80606e9c2afed5401f15d15e3671.tar.gz
Merge branch 'rightlib' into mergelibs-241021-1020
Diffstat (limited to 'build')
-rw-r--r--build/conf/licenses.json1
-rw-r--r--build/conf/linkers/ld.conf3
-rw-r--r--build/external_resources/ymake/public.resources.json10
-rw-r--r--build/external_resources/ymake/resources.json10
-rw-r--r--build/mapping.conf.json14
-rw-r--r--build/platform/python/ymake_python3/resources.json6
-rw-r--r--build/platform/test_tool/host.ya.make.inc10
-rw-r--r--build/platform/test_tool/host_os.ya.make.inc10
-rw-r--r--build/ymake.core.conf38
9 files changed, 76 insertions, 26 deletions
diff --git a/build/conf/licenses.json b/build/conf/licenses.json
index abfed06c8d..2832e2871a 100644
--- a/build/conf/licenses.json
+++ b/build/conf/licenses.json
@@ -48,6 +48,7 @@
"GCC-exception-3.1",
"GDAL",
"GFDL-1.1-or-later",
+ "GFDL-1.3-or-later",
"Go-License",
"Google-Patent-License-Webm",
"Google-Patent-License-Webrtc",
diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf
index afaaa1cb42..df576648f3 100644
--- a/build/conf/linkers/ld.conf
+++ b/build/conf/linkers/ld.conf
@@ -340,7 +340,8 @@ SWIG_DLL_JAR_CMD=\
$REAL_SWIG_DLL_JAR_CMD && \
$DWARF_COMMAND
-_LD_TAIL_LINK_LIB=$AUTO_INPUT ${hide;kv:"p AR"} $TOOLCHAIN_ENV ${hide;kv:"pc light-red"} ${hide;kv:"show_out"}
+_LD_LINK_LIB_EXTRA_INPUT=
+_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"}
_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_LIB_GENERATE_MF=$GENERATE_MF &&
when ($TIDY == "yes") {
diff --git a/build/external_resources/ymake/public.resources.json b/build/external_resources/ymake/public.resources.json
index 93d20b5650..3d0dcf2c0c 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:7255221832"
+ "uri": "sbr:7299619998"
},
"darwin-arm64": {
- "uri": "sbr:7255220942"
+ "uri": "sbr:7299619667"
},
"linux": {
- "uri": "sbr:7255223649"
+ "uri": "sbr:7299620690"
},
"linux-aarch64": {
- "uri": "sbr:7255220285"
+ "uri": "sbr:7299619265"
},
"win32-clang-cl": {
- "uri": "sbr:7255222862"
+ "uri": "sbr:7299620278"
}
}
}
diff --git a/build/external_resources/ymake/resources.json b/build/external_resources/ymake/resources.json
index aec5a0de95..91bc84b2d7 100644
--- a/build/external_resources/ymake/resources.json
+++ b/build/external_resources/ymake/resources.json
@@ -1,19 +1,19 @@
{
"by_platform": {
"darwin": {
- "uri": "sbr:7255220552"
+ "uri": "sbr:7299618240"
},
"darwin-arm64": {
- "uri": "sbr:7255219972"
+ "uri": "sbr:7299617682"
},
"linux": {
- "uri": "sbr:7255222128"
+ "uri": "sbr:7299619235"
},
"linux-aarch64": {
- "uri": "sbr:7255219168"
+ "uri": "sbr:7299616994"
},
"win32-clang-cl": {
- "uri": "sbr:7255221316"
+ "uri": "sbr:7299618667"
}
}
}
diff --git a/build/mapping.conf.json b/build/mapping.conf.json
index 5522059b32..c527364b80 100644
--- a/build/mapping.conf.json
+++ b/build/mapping.conf.json
@@ -418,6 +418,8 @@
"7258655189": "https://devtools-registry.s3.yandex.net/7258655189",
"7268412397": "https://devtools-registry.s3.yandex.net/7268412397",
"7268415538": "https://devtools-registry.s3.yandex.net/7268415538",
+ "7303146160": "https://devtools-registry.s3.yandex.net/7303146160",
+ "7303155140": "https://devtools-registry.s3.yandex.net/7303155140",
"5486731632": "https://devtools-registry.s3.yandex.net/5486731632",
"5514350352": "https://devtools-registry.s3.yandex.net/5514350352",
"5514360398": "https://devtools-registry.s3.yandex.net/5514360398",
@@ -575,6 +577,7 @@
"7167514017": "https://devtools-registry.s3.yandex.net/7167514017",
"7211385890": "https://devtools-registry.s3.yandex.net/7211385890",
"7255221832": "https://devtools-registry.s3.yandex.net/7255221832",
+ "7299619998": "https://devtools-registry.s3.yandex.net/7299619998",
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -619,6 +622,7 @@
"7167513539": "https://devtools-registry.s3.yandex.net/7167513539",
"7211384971": "https://devtools-registry.s3.yandex.net/7211384971",
"7255220942": "https://devtools-registry.s3.yandex.net/7255220942",
+ "7299619667": "https://devtools-registry.s3.yandex.net/7299619667",
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -663,6 +667,7 @@
"7167514830": "https://devtools-registry.s3.yandex.net/7167514830",
"7211387031": "https://devtools-registry.s3.yandex.net/7211387031",
"7255223649": "https://devtools-registry.s3.yandex.net/7255223649",
+ "7299620690": "https://devtools-registry.s3.yandex.net/7299620690",
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -707,6 +712,7 @@
"7167513152": "https://devtools-registry.s3.yandex.net/7167513152",
"7211384106": "https://devtools-registry.s3.yandex.net/7211384106",
"7255220285": "https://devtools-registry.s3.yandex.net/7255220285",
+ "7299619265": "https://devtools-registry.s3.yandex.net/7299619265",
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -751,6 +757,7 @@
"7167514469": "https://devtools-registry.s3.yandex.net/7167514469",
"7211386552": "https://devtools-registry.s3.yandex.net/7211386552",
"7255222862": "https://devtools-registry.s3.yandex.net/7255222862",
+ "7299620278": "https://devtools-registry.s3.yandex.net/7299620278",
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1353,6 +1360,8 @@
"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",
+ "7303146160": "devtools/ya/test/programs/test_tool/bin/test_tool for linux",
+ "7303155140": "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",
@@ -1510,6 +1519,7 @@
"7167514017": "devtools/ymake/bin/ymake for darwin",
"7211385890": "devtools/ymake/bin/ymake for darwin",
"7255221832": "devtools/ymake/bin/ymake for darwin",
+ "7299619998": "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",
@@ -1554,6 +1564,7 @@
"7167513539": "devtools/ymake/bin/ymake for darwin-arm64",
"7211384971": "devtools/ymake/bin/ymake for darwin-arm64",
"7255220942": "devtools/ymake/bin/ymake for darwin-arm64",
+ "7299619667": "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",
@@ -1598,6 +1609,7 @@
"7167514830": "devtools/ymake/bin/ymake for linux",
"7211387031": "devtools/ymake/bin/ymake for linux",
"7255223649": "devtools/ymake/bin/ymake for linux",
+ "7299620690": "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",
@@ -1642,6 +1654,7 @@
"7167513152": "devtools/ymake/bin/ymake for linux-aarch64",
"7211384106": "devtools/ymake/bin/ymake for linux-aarch64",
"7255220285": "devtools/ymake/bin/ymake for linux-aarch64",
+ "7299619265": "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",
@@ -1686,6 +1699,7 @@
"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",
+ "7299620278": "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/python/ymake_python3/resources.json b/build/platform/python/ymake_python3/resources.json
index f68bc69d4b..53c4a82d5b 100644
--- a/build/platform/python/ymake_python3/resources.json
+++ b/build/platform/python/ymake_python3/resources.json
@@ -1,18 +1,18 @@
{
"by_platform": {
- "darwin": {
+ "darwin-x86_64": {
"uri": "sbr:7203671634"
},
"darwin-arm64": {
"uri": "sbr:7203671142"
},
- "linux": {
+ "linux-x86_64": {
"uri": "sbr:7203672677"
},
"linux-aarch64": {
"uri": "sbr:7203672172"
},
- "win32": {
+ "win32-x86_64": {
"uri": "sbr:7203670792"
}
}
diff --git a/build/platform/test_tool/host.ya.make.inc b/build/platform/test_tool/host.ya.make.inc
index 33747e51fd..058b1a9d61 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:7268414015)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303154871)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268412855)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303154594)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268415538)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303155140)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268411722)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303154435)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268414733)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303155023)
ENDIF()
diff --git a/build/platform/test_tool/host_os.ya.make.inc b/build/platform/test_tool/host_os.ya.make.inc
index 5c8418f65d..0066d0c96f 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:7268408068)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303145767)
ELSEIF (HOST_OS_DARWIN AND HOST_ARCH_ARM64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268405912)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303145350)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268412397)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303146160)
ELSEIF (HOST_OS_LINUX AND HOST_ARCH_AARCH64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268404402)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303145126)
ELSEIF (HOST_OS_WINDOWS AND HOST_ARCH_X86_64)
- DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7268410113)
+ DECLARE_EXTERNAL_RESOURCE(TEST_TOOL_HOST sbr:7303145973)
ENDIF()
diff --git a/build/ymake.core.conf b/build/ymake.core.conf
index 79ad503dea..8470d35c2f 100644
--- a/build/ymake.core.conf
+++ b/build/ymake.core.conf
@@ -4083,13 +4083,25 @@ macro CUDA_NVCC_FLAGS(Flags...) {
SET_APPEND(CUDA_NVCC_FLAGS $Flags)
}
+CUDA_DEVICE_LINK_LIBRARY_CMD=$NVCC_OLD $NVCC_FLAGS -o ${output;suf=${OBJ_SUF}${NVCC_OBJ_EXT}:"devlink"} -dlink ${input:_NVCC_DEVICE_SRCS} -I$CUDA_TARGET_ROOT/include --compiler-options ${join= :C_FLAGS_PLATFORM} $NVCC_ENV ${hide;kv:"p DL"} ${hide;kv:"pc light-blue"} && $LINK_LIB
+
+### @usage: CUDA_DEVICE_LINK_LIBRARY()
+###
+### The LIBRARY() module with an additional step with CUDA device linking.
+### Use [NVCC_DEVICE_LINK](#macro_NVCC_DEVICE_LINK) macro to specify sources for device link.
+module CUDA_DEVICE_LINK_LIBRARY: LIBRARY {
+ SET(_LD_LINK_LIB_EXTRA_INPUT ${output;suf=${OBJ_SUF}${NVCC_OBJ_EXT}:"devlink"})
+ .CMD=$CUDA_DEVICE_LINK_LIBRARY_CMD
+}
+
# tag:flags
### @usage: NVCC_DEVICE_LINK(file.cu...)
### Run nvcc --device-link on objects compiled from srcs with --device-c.
### This generates a stub object devlink.o that supplies missing pieces for the
### host linker to link relocatable device objects into the final executable.
+### This macro can be used only with [CUDA_DEVICE_LINK_LIBRARY](#module_CUDA_DEVICE_LINK_LIBRARY) module.
macro NVCC_DEVICE_LINK(Srcs...) {
- .CMD=$NVCC_OLD $NVCC_FLAGS -o ${output;suf=${OBJ_SUF}${NVCC_OBJ_EXT}:"devlink"} -dlink ${input;suf=${OBJ_SUF}${NVCC_OBJ_EXT}:Srcs} -I$CUDA_TARGET_ROOT/include --compiler-options ${quo:C_FLAGS_PLATFORM} $NVCC_ENV ${hide;kv:"p DL"} ${hide;kv:"pc light-blue"}
+ SET_APPEND(_NVCC_DEVICE_SRCS ${suf=${OBJ_SUF}${NVCC_OBJ_EXT}:Srcs})
.PEERDIR=build/platform/cuda
}
@@ -4335,7 +4347,8 @@ macro NEED_CHECK(Flags...) {
ENABLE(UNUSED_MACRO)
}
-### @usage: NO_NEED_CHECK()
+# tag:deprecated
+### @usage: NO_NEED_CHECK() # deprecated
###
### Commits to the project marked with this macro will not be affected by higher-level NEED_CHECK macro.
macro NO_NEED_CHECK(Flags...) {
@@ -4353,6 +4366,27 @@ macro NEED_REVIEW(Flags...) {
ENABLE(UNUSED_MACRO)
}
+# tag:deprecated
+### @usage: OWNER(UsersOrGroups) # deprecated
+###
+### Old way to cpecify owners of code. Now completely unused. Use a.yaml to specify ownership
+macro OWNER(Owners...) {
+ ENABLE(UNUSED_MACRO)
+}
+
+### @usage: SUBSCIBER(UsersOrGroups)
+###
+### Add observers of the code.
+### In the SUBSCRIBER macro you can use:
+### 1. login-s from staff.yandex-team.ru
+### 2. Review group (to specify the Code-review group need to use the prefix g:)
+###
+### Note: currently SUBSCRIBER is read only by Arcanum and is not processed by
+### the build system. It's planned to be phased out in favor of subcription via a.yaml
+macro SUBSCIBER(Subscribers...) {
+ ENABLE(UNUSED_MACRO)
+}
+
MODVER=unknown
### @usage: VERSION(Args...)
###