diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2025-03-01 18:17:48 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2025-03-01 18:28:39 +0300 |
| commit | 3eebf10660ed2ff1ef6682102002cacff4aa17df (patch) | |
| tree | 767ed563910f08ccd1d2205b0b00798aa35fa050 | |
| parent | 513eec13663e999f0e8537c42e804e5e8684f19a (diff) | |
| download | ydb-3eebf10660ed2ff1ef6682102002cacff4aa17df.tar.gz | |
Intermediate changes
commit_hash:c58bbd0926a03598caf2b7ba8ed63be206867fa3
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix | 6 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/patches/pr47-dont-use-static.patch | 23 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxxrt/ya.make | 4 |
3 files changed, 5 insertions, 28 deletions
diff --git a/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix b/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix index 3f5adb26a2..af8de9dc63 100644 --- a/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix +++ b/contrib/libs/cxxsupp/libcxxrt/.yandex_meta/override.nix @@ -1,12 +1,12 @@ pkgs: attrs: with pkgs; rec { - version = "2024-10-30"; - revision = "6f2fdfebcd6291d763de8b17740d636f01761890"; + version = "2025-02-25"; + revision = "a6f71cbc3a1e1b8b9df241e081fa0ffdcde96249"; src = fetchFromGitHub { owner = "libcxxrt"; repo = "libcxxrt"; rev = "${revision}"; - hash = "sha256-iUuIhwFg1Ys9DDoyDFTjEIlCVDdA1TACwtYXSRr5+2g="; + hash = "sha256-+oTjU/DgOEIwJebSVkSEt22mJSdeONozB8FfzEiESHU="; }; nativeBuildInputs = [ cmake ]; diff --git a/contrib/libs/cxxsupp/libcxxrt/patches/pr47-dont-use-static.patch b/contrib/libs/cxxsupp/libcxxrt/patches/pr47-dont-use-static.patch deleted file mode 100644 index e9427a4f5e..0000000000 --- a/contrib/libs/cxxsupp/libcxxrt/patches/pr47-dont-use-static.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 7b33a3cb0a09c6cda952c6209404fcbf5177fc22 Mon Sep 17 00:00:00 2001 -From: Yuriy Chernyshov <thegeorg@yandex-team.com> -Date: Tue, 25 Feb 2025 11:20:35 +0100 -Subject: [PATCH] Do not use static for a local variable - -This looks like a typo ---- - src/exception.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/exception.cc b/src/exception.cc -index 5034809..9bcf903 100644 ---- a/exception.cc -+++ b/exception.cc -@@ -337,7 +337,7 @@ static void terminate_with_diagnostics() { - if (ex != nullptr) { - fprintf(stderr, "Terminating due to uncaught exception %p", static_cast<void*>(ex)); - ex = realExceptionFromException(ex); -- static const __class_type_info *e_ti = -+ const __class_type_info *e_ti = - static_cast<const __class_type_info*>(&typeid(std::exception)); - const __class_type_info *throw_ti = - dynamic_cast<const __class_type_info*>(ex->exceptionType); diff --git a/contrib/libs/cxxsupp/libcxxrt/ya.make b/contrib/libs/cxxsupp/libcxxrt/ya.make index 91cf9c40d6..f9b1964b1f 100644 --- a/contrib/libs/cxxsupp/libcxxrt/ya.make +++ b/contrib/libs/cxxsupp/libcxxrt/ya.make @@ -11,9 +11,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(2024-10-30) +VERSION(2025-02-25) -ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/6f2fdfebcd6291d763de8b17740d636f01761890.tar.gz) +ORIGINAL_SOURCE(https://github.com/libcxxrt/libcxxrt/archive/a6f71cbc3a1e1b8b9df241e081fa0ffdcde96249.tar.gz) PEERDIR( contrib/libs/libunwind |