diff options
author | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-01 20:45:28 +0300 |
---|---|---|
committer | arcadia-devtools <arcadia-devtools@yandex-team.ru> | 2022-03-01 20:45:28 +0300 |
commit | c71dfbc7a152b6f951bca559dcfa23af6d3952a3 (patch) | |
tree | fe52870e806f35cce8853bd4a0e0b6ec3619bf10 /contrib/libs | |
parent | 05995d9c65035b08087f9971beea7a009b2b1872 (diff) | |
download | ydb-c71dfbc7a152b6f951bca559dcfa23af6d3952a3.tar.gz |
intermediate changes
ref:1bd5d52142d3b1cd797d1dcc1dc7c82ea4a091be
Diffstat (limited to 'contrib/libs')
-rw-r--r-- | contrib/libs/cxxsupp/libcxx/CMakeLists.txt | 1 | ||||
-rw-r--r-- | contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt | 3 | ||||
-rw-r--r-- | contrib/libs/llvm12/utils/TableGen/CMakeLists.txt | 4 | ||||
-rw-r--r-- | contrib/libs/sqlite3/CMakeLists.txt | 42 | ||||
-rw-r--r-- | contrib/libs/xz/common/CMakeLists.txt | 24 | ||||
-rw-r--r-- | contrib/libs/xz/liblzma/CMakeLists.txt | 108 |
6 files changed, 5 insertions, 177 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt index f7b2a5eac6d..a24b57f42fa 100644 --- a/contrib/libs/cxxsupp/libcxx/CMakeLists.txt +++ b/contrib/libs/cxxsupp/libcxx/CMakeLists.txt @@ -11,6 +11,7 @@ add_library(libs-cxxsupp-libcxx) target_compile_options(libs-cxxsupp-libcxx PUBLIC -nostdinc++ -DLIBCXX_BUILDING_LIBCXXRT + -D_LIBCPP_ENABLE_CXX17_REMOVED_FEATURES ) target_compile_options(libs-cxxsupp-libcxx PRIVATE -D_LIBCPP_BUILDING_LIBRARY diff --git a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt index 07380710acb..41e0e8d87ce 100644 --- a/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt +++ b/contrib/libs/cxxsupp/libcxxabi-parts/CMakeLists.txt @@ -8,6 +8,9 @@ add_library(libs-cxxsupp-libcxxabi-parts) +target_compile_options(libs-cxxsupp-libcxxabi-parts PUBLIC + -nostdinc++ +) target_compile_options(libs-cxxsupp-libcxxabi-parts PRIVATE -D_LIBCXXABI_BUILDING_LIBRARY ) diff --git a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt index 01d3e20d85f..93bbea30a1c 100644 --- a/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt +++ b/contrib/libs/llvm12/utils/TableGen/CMakeLists.txt @@ -13,6 +13,7 @@ target_include_directories(llvm-tblgen PRIVATE ) target_link_libraries(llvm-tblgen PUBLIC contrib-libs-cxxsupp + library-cpp-lfalloc contrib-libs-llvm12 llvm12-lib-Demangle llvm12-lib-Support @@ -79,10 +80,7 @@ target_link_flags(llvm-tblgen -lrt -Wl,--no-as-needed -fPIC - -Wl,--gdb-index -fPIC - -fuse-ld=$(LLD_ROOT-sbr:2283360772)/ld - -Wl,--no-rosegment -lpthread -lrt -ldl diff --git a/contrib/libs/sqlite3/CMakeLists.txt b/contrib/libs/sqlite3/CMakeLists.txt deleted file mode 100644 index 7a5a1ce6c1d..00000000000 --- a/contrib/libs/sqlite3/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ - -# This file was gererated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(contrib-libs-sqlite3) -target_compile_options(contrib-libs-sqlite3 PRIVATE - -DBUILD_sqlite - -DHAVE_USLEEP - -DSQLITE_ENABLE_COLUMN_METADATA - -DSQLITE_ENABLE_DBSTAT_VTAB - -DSQLITE_ENABLE_FTS3 - -DSQLITE_ENABLE_FTS3_PARENTHESIS - -DSQLITE_ENABLE_FTS3_TOKENIZER - -DSQLITE_ENABLE_FTS4 - -DSQLITE_ENABLE_FTS5 - -DSQLITE_ENABLE_JSON1 - -DSQLITE_ENABLE_MATH_FUNCTIONS - -DSQLITE_ENABLE_RTREE - -DSQLITE_ENABLE_STMT_SCANSTATUS - -DSQLITE_ENABLE_UNLOCK_NOTIFY - -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT - -DSQLITE_HAVE_ZLIB=1 - -DSQLITE_MAX_EXPR_DEPTH=10000 - -DSQLITE_MAX_VARIABLE_NUMBER=250000 - -DSQLITE_SECURE_DELETE - -DSQLITE_SOUNDEX - -DSQLITE_TEMP_STORE=1 - -DSQLITE_THREADSAFE=1 - -DSQLITE_OS_UNIX -) -target_include_directories(contrib-libs-sqlite3 PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/sqlite3 -) -target_sources(contrib-libs-sqlite3 PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/sqlite3/sqlite3.c - ${CMAKE_SOURCE_DIR}/contrib/libs/sqlite3/test_multiplex.c -) diff --git a/contrib/libs/xz/common/CMakeLists.txt b/contrib/libs/xz/common/CMakeLists.txt deleted file mode 100644 index a9f5098f6d4..00000000000 --- a/contrib/libs/xz/common/CMakeLists.txt +++ /dev/null @@ -1,24 +0,0 @@ - -# This file was gererated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(libs-xz-common) -target_compile_options(libs-xz-common PRIVATE - -DTUKLIB_SYMBOL_PREFIX=lzma_ -) -target_include_directories(libs-xz-common PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/xz - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/common -) -target_link_libraries(libs-xz-common PUBLIC - contrib-libs-cxxsupp - yutil -) -target_sources(libs-xz-common PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/common/tuklib_cpucores.c -) diff --git a/contrib/libs/xz/liblzma/CMakeLists.txt b/contrib/libs/xz/liblzma/CMakeLists.txt deleted file mode 100644 index 3926ba1729e..00000000000 --- a/contrib/libs/xz/liblzma/CMakeLists.txt +++ /dev/null @@ -1,108 +0,0 @@ - -# This file was gererated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(libs-xz-liblzma) -target_compile_options(libs-xz-liblzma PUBLIC - -DLZMA_API_STATIC -) -target_compile_options(libs-xz-liblzma PRIVATE - -DHAVE_CONFIG_H - -DTUKLIB_SYMBOL_PREFIX=lzma_ -) -target_include_directories(libs-xz-liblzma PUBLIC - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/api -) -target_include_directories(libs-xz-liblzma PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/api - ${CMAKE_SOURCE_DIR}/contrib/libs/xz - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/delta - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lz - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/rangecoder - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/common -) -target_link_libraries(libs-xz-liblzma PUBLIC - contrib-libs-cxxsupp - libs-xz-common -) -target_sources(libs-xz-liblzma PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check/check.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check/crc32_fast.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check/crc32_table.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check/crc64_fast.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check/crc64_table.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/check/sha256.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/alone_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/alone_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/auto_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_buffer_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_buffer_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_header_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_header_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/block_util.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/common.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/easy_buffer_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/easy_decoder_memusage.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/easy_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/easy_encoder_memusage.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/easy_preset.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_buffer_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_buffer_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_common.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_flags_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/filter_flags_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/hardware_cputhreads.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/index.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/index_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/index_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/index_hash.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/outqueue.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_buffer_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_buffer_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_encoder_mt.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_flags_common.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_flags_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/stream_flags_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/vli_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/vli_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/common/vli_size.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/delta/delta_common.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/delta/delta_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/delta/delta_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lz/lz_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lz/lz_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lz/lz_encoder_mf.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/fastpos_table.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma2_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma2_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma_encoder_optimum_fast.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma_encoder_optimum_normal.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/lzma/lzma_encoder_presets.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/rangecoder/price_table.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/arm.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/armthumb.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/ia64.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/powerpc.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/simple_coder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/simple_decoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/simple_encoder.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/sparc.c - ${CMAKE_SOURCE_DIR}/contrib/libs/xz/liblzma/simple/x86.c -) |