Merge absl/city and absl/demangle sublibraries to where they belong

9 files changed, 2 insertions, 56 deletions

diff --git a/contrib/restricted/abseil-cpp/absl/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/CMakeLists.txt
index 6b663fea8e..cb86716db0 100644
--- a/contrib/restricted/abseil-cpp/absl/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/CMakeLists.txt
@@ -8,10 +8,8 @@
 
 add_subdirectory(algorithm)
 add_subdirectory(base)
-add_subdirectory(city)
 add_subdirectory(container)
 add_subdirectory(debugging)
-add_subdirectory(demangle)
 add_subdirectory(flags)
 add_subdirectory(functional)
 add_subdirectory(hash)
diff --git a/contrib/restricted/abseil-cpp/absl/city/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/city/CMakeLists.txt
deleted file mode 100644
index da9b38d932..0000000000
--- a/contrib/restricted/abseil-cpp/absl/city/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(abseil-cpp-absl-city)
-target_compile_options(abseil-cpp-absl-city PRIVATE
-  -DNOMINMAX
-  -Wno-everything
-)
-target_include_directories(abseil-cpp-absl-city PUBLIC
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp
-)
-target_link_libraries(abseil-cpp-absl-city PUBLIC
-  contrib-libs-cxxsupp
-  abseil-cpp-absl-base
-)
-target_sources(abseil-cpp-absl-city PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/hash/internal/city.cc
-)
diff --git a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
index af4c43fdb6..a5060481a7 100644
--- a/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/container/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(abseil-cpp-absl-container PUBLIC
   contrib-libs-cxxsupp
   abseil-cpp-absl-base
   abseil-cpp-absl-debugging
-  abseil-cpp-absl-demangle
   abseil-cpp-absl-hash
   abseil-cpp-absl-numeric
   abseil-cpp-absl-profiling
diff --git a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
index 6dbbe44958..72aad4f910 100644
--- a/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/debugging/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(abseil-cpp-absl-debugging PUBLIC
 target_sources(abseil-cpp-absl-debugging PRIVATE
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/failure_signal_handler.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/internal/address_is_readable.cc
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/internal/elf_mem_image.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/internal/examine_stack.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/internal/vdso_support.cc
diff --git a/contrib/restricted/abseil-cpp/absl/demangle/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/demangle/CMakeLists.txt
deleted file mode 100644
index 695e66033d..0000000000
--- a/contrib/restricted/abseil-cpp/absl/demangle/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(abseil-cpp-absl-demangle)
-target_compile_options(abseil-cpp-absl-demangle PRIVATE
-  -DNOMINMAX
-  -Wno-everything
-)
-target_include_directories(abseil-cpp-absl-demangle PUBLIC
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp
-)
-target_link_libraries(abseil-cpp-absl-demangle PUBLIC
-  contrib-libs-cxxsupp
-  abseil-cpp-absl-base
-)
-target_sources(abseil-cpp-absl-demangle PRIVATE
-  ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/debugging/internal/demangle.cc
-)
diff --git a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
index efa4023fee..c43d61e8bf 100644
--- a/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/flags/CMakeLists.txt
@@ -18,10 +18,8 @@ target_include_directories(abseil-cpp-absl-flags PUBLIC
 target_link_libraries(abseil-cpp-absl-flags PUBLIC
   contrib-libs-cxxsupp
   abseil-cpp-absl-base
-  abseil-cpp-absl-city
   abseil-cpp-absl-container
   abseil-cpp-absl-debugging
-  abseil-cpp-absl-demangle
   abseil-cpp-absl-hash
   abseil-cpp-absl-numeric
   abseil-cpp-absl-profiling
diff --git a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
index 645f7e53e8..c85cecaa09 100644
--- a/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/hash/CMakeLists.txt
@@ -18,12 +18,12 @@ target_include_directories(abseil-cpp-absl-hash PUBLIC
 target_link_libraries(abseil-cpp-absl-hash PUBLIC
   contrib-libs-cxxsupp
   abseil-cpp-absl-base
-  abseil-cpp-absl-city
   abseil-cpp-absl-numeric
   abseil-cpp-absl-strings
   abseil-cpp-absl-types
 )
 target_sources(abseil-cpp-absl-hash PRIVATE
+  ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/hash/internal/city.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/hash/internal/hash.cc
   ${CMAKE_SOURCE_DIR}/contrib/restricted/abseil-cpp/absl/hash/internal/low_level_hash.cc
 )
diff --git a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
index 9643ef85f5..6e5adb82e4 100644
--- a/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/status/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(abseil-cpp-absl-status PUBLIC
   contrib-libs-cxxsupp
   abseil-cpp-absl-base
   abseil-cpp-absl-debugging
-  abseil-cpp-absl-demangle
   abseil-cpp-absl-numeric
   abseil-cpp-absl-profiling
   abseil-cpp-absl-strings
diff --git a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
index 18bcc248bf..25213b9d77 100644
--- a/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
+++ b/contrib/restricted/abseil-cpp/absl/synchronization/CMakeLists.txt
@@ -19,7 +19,6 @@ target_link_libraries(abseil-cpp-absl-synchronization PUBLIC
   contrib-libs-cxxsupp
   abseil-cpp-absl-base
   abseil-cpp-absl-debugging
-  abseil-cpp-absl-demangle
   abseil-cpp-absl-numeric
   abseil-cpp-absl-strings
   abseil-cpp-absl-time