diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-02-13 18:38:05 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-02-13 18:38:05 +0000 |
| commit | 28180f60aec6dcb2b662b6417c90226553ebe2dc (patch) | |
| tree | 9ca4d2b0ea989b075f60d2746159e891c1aa77f7 /build/conf | |
| parent | 09744cf9fbdd1cd31f648b5fabc8a9ed09875e3b (diff) | |
| parent | 36161988ade9e56ec69a44ba4ff084ede6e44ee7 (diff) | |
| download | ydb-28180f60aec6dcb2b662b6417c90226553ebe2dc.tar.gz | |
Merge pull request #14512 from ydb-platform/merge-libs-250213-0050
Diffstat (limited to 'build/conf')
| -rw-r--r-- | build/conf/licenses.json | 5 | ||||
| -rw-r--r-- | build/conf/linkers/ld.conf | 7 |
2 files changed, 3 insertions, 9 deletions
diff --git a/build/conf/licenses.json b/build/conf/licenses.json index 792f8e829b..42627fda61 100644 --- a/build/conf/licenses.json +++ b/build/conf/licenses.json @@ -4,7 +4,6 @@ "AFL-2.0", "Amazon-SL", "APSL-1.0", - "Artistic-2.0", "ASM-BSD-3-Clause", "BCL", "Bison-Exception", @@ -39,7 +38,6 @@ "CC-BY-SA-4.0", "CDDL", "CECILL-B", - "ClArtistic", "DSO-1.1", "Elastic-License-2.0", "FSFUL", @@ -159,6 +157,7 @@ "AGPL-3.0-or-later", "Artistic-1.0", "Artistic-1.0-Perl", + "ClArtistic", "confluent-community-1.0", "Moderne-Source-Available-License" ] @@ -180,6 +179,7 @@ "Apache-2.0", "Apache-2.0 WITH LLVM-exception", "APSL-2.0", + "Artistic-2.0", "Beerware", "blessing", "Brian-Gladman-3-Clause", @@ -213,6 +213,7 @@ "Cmu-Computing-Services", "CUP-Parser", "curl", + "Custom-clarified-artistic-proofread", "Custom-eigen", "Custom-fft2d", "Custom-fft4g", diff --git a/build/conf/linkers/ld.conf b/build/conf/linkers/ld.conf index 2aa0f93b60..79006c21ab 100644 --- a/build/conf/linkers/ld.conf +++ b/build/conf/linkers/ld.conf @@ -354,13 +354,6 @@ _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_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 |