Merge 9a80578 into eba58c9

Author: alexv-smirnov

build/conf/linkers/ld.conf

@@ -345,15 +345,22 @@ LINK_EXEC_DYN_LIB=\
     $DWARF_COMMAND && \
     $LINK_ADDITIONAL_SECTIONS_COMMAND
 
+_LD_ARCHIVER_KV_PLUGIN=
+when ($_AR_PLUGIN != "") {
+    _LD_ARCHIVER_KV_PLUGIN=--plugin ${input:_AR_PLUGIN}
+}
+
 _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_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 --
+
 when ($MAPSMOBI_BUILD_TARGET == "yes") {
     _LD_ARCHIVER+= "no-openssl3"
-} 
+}
 otherwise {
     _LD_ARCHIVER+= "enable-openssl3"
 }
+
 _LD_LIB_GENERATE_MF=$GENERATE_MF &&
 when ($TIDY == "yes") {
     _LD_ARCHIVER=$YMAKE_PYTHON ${input:"build/scripts/clang_tidy_arch.py"} --source-root $ARCADIA_ROOT --build-root $ARCADIA_BUILD_ROOT --output-file

build/platform/yfm/ya.make

@@ -6,10 +6,10 @@ ENDIF()
 
 DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
     YFM_TOOL
-    sbr:7654793679 FOR DARWIN-ARM64
-    sbr:7654793679 FOR DARWIN
-    sbr:7655042582 FOR LINUX
-    sbr:7654921682 FOR WIN32
+    sbr:8013150302 FOR DARWIN-ARM64
+    sbr:8013150302 FOR DARWIN
+    sbr:8013116004 FOR LINUX
+    sbr:8013130168 FOR WIN32
 )
 
 END()

build/scripts/link_lib.py

@@ -1,12 +1,25 @@
+from __future__ import print_function
+
 import sys
 import subprocess
 import tempfile
 import os
 import shutil
+import argparse
 
 
 class Opts(object):
     def __init__(self, args):
+        kvs = args.index('--')
+        kve = args.index('--', kvs + 1)
+        kv = args[kvs + 1:kve]
+        args = args[:kvs] + args[kve + 1:]
+
+        parser = argparse.ArgumentParser()
+        parser.add_argument('--plugin')
+        kvargs = parser.parse_args(kv)
+
+        self.ar_plugin = kvargs.plugin
         self.archiver = args[0]
         self.arch_type = args[1]
         self.llvm_ar_format = args[2]
@@ -165,3 +178,6 @@ def call():
 
     if opts.enable_openssl3 != 'no-openssl3' and os.path.basename(opts.output) in ['libcontrib-libs-openssl.a', 'liblibs-openssl-crypto.a']:
         rename_syms(os.path.dirname(opts.archiver) + '/', opts.output)
+
+    if opts.ar_plugin:
+        subprocess.check_call([sys.executable, opts.ar_plugin, opts.output, '--'] + sys.argv[1:])

build/ymake.core.conf

@@ -3136,6 +3136,10 @@ macro _SRC_f_old(SRC, SRCFLAGS...) {
     .CMD=$YMAKE_PYTHON ${input:"build/scripts/f2c.py"} -t ${tool:"contrib/tools/f2c"} -c ${input:SRC} -o ${output:SRC.c} ${hide;output_include:"f2c.h"} ${hide;kv:"p FT"} ${hide;kv:"pc light-green"}
 }
 
+macro AR_PLUGIN(name) {
+    SET(_AR_PLUGIN $name.pyplugin)
+}
+
 macro LD_PLUGIN(name) {
     SRCS(GLOBAL $name.pyplugin)
 }

contrib/libs/dtl/.yandex_meta/devtools.licenses.report

@@ -33,7 +33,7 @@
 # FILE_INCLUDE - include all file data into licenses text file
 # =======================
 
-KEEP     LicenseRef-scancode-unknown-license-reference 27ff83b6d7e95b709c1a8b94532ebef1
+KEEP     BSD-3-Clause         27ff83b6d7e95b709c1a8b94532ebef1
 BELONGS ya.make
     License text:
         Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
@@ -45,7 +45,7 @@ BELONGS ya.make
     Files with this license:
         README.md [685:685]
 
-KEEP     LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause 3d436eacb955b50a8f94435e0ba12145
+KEEP     BSD-3-Clause         3d436eacb955b50a8f94435e0ba12145
 BELONGS ya.make
     License text:
            In short, Diff Template Library is distributed under so called "BSD license",
@@ -90,7 +90,7 @@ FILE_INCLUDE CONTRIBUTORS found in files: COPYING at line 20, COPYING at line 24
     Files with this license:
         COPYING [6:30]
 
-KEEP     LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause d9ebc19a46340bfaf128a098aade97ed
+KEEP     BSD-3-Clause         d9ebc19a46340bfaf128a098aade97ed
 BELONGS ya.make
     License text:
         In short, Diff Template Library is distributed under so called "BSD license",

contrib/libs/dtl/.yandex_meta/licenses.list.txt

@@ -1,3 +1,7 @@
+====================BSD-3-Clause====================
+   In short, Diff Template Library is distributed under so called "BSD license",
+
+
 ====================BSD-3-Clause====================
    Redistribution and use in source and binary forms, with or without modification,
    are permitted provided that the following conditions are met:
@@ -26,6 +30,13 @@
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+====================BSD-3-Clause====================
+In short, Diff Template Library is distributed under so called "BSD license",
+
+
+====================BSD-3-Clause====================
+Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
+
 ====================BSD-3-Clause====================
 Redistribution and use in source and binary forms, with or without modification, 
 are permitted provided that the following conditions are met:
@@ -61,14 +72,3 @@ All rights reserved.
 ====================File: CONTRIBUTORS====================
 Tatsuhiko Kubo <[email protected]>
 Jan Weiß <[email protected]>
-
-
-====================LicenseRef-scancode-unknown-license-reference====================
-Please read the file [COPYING](https://github.com/cubicdaiya/dtl/blob/master/COPYING).
-
-====================LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause====================
-   In short, Diff Template Library is distributed under so called "BSD license",
-
-
-====================LicenseRef-scancode-unknown-license-reference AND BSD-3-Clause====================
-In short, Diff Template Library is distributed under so called "BSD license",

contrib/libs/dtl/ya.make

@@ -2,10 +2,7 @@
 
 LIBRARY()
 
-LICENSE(
-    BSD-3-Clause AND
-    LicenseRef-scancode-unknown-license-reference
-)
+LICENSE(BSD-3-Clause)
 
 LICENSE_TEXTS(.yandex_meta/licenses.list.txt)