Merge branch 'rightlib' into merge-libs-250204-0050

7 files changed, 15 insertions, 30 deletions

diff --git a/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym b/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
index 2ba2f81dd17..87c16c302e9 100644
--- a/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
+++ b/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym
@@ -113,8 +113,9 @@ ELSEIF (OS_IOS)
     )
 ELSEIF (OS_LINUX OR OS_DARWIN)
     IF (ARCH_ARM7)
-        # XXX: libcxxrt support for ARM is currently broken
-        SET(CXX_RT "glibcxx_static")
+        # libcxxrt support for ARM is currently broken, use libcxxabi instead
+        # But allow switching back to glibcxx_static via -DCXX_RT=glibcxx_static
+        DEFAULT(CXX_RT "libcxxabi")
         # ARM7 OS_SDK has old libstdc++ without aligned allocation support
         CFLAGS(
             GLOBAL -fno-aligned-new
diff --git a/contrib/libs/cxxsupp/libcxx/ya.make b/contrib/libs/cxxsupp/libcxx/ya.make
index 7f7045a21e4..a3f66347649 100644
--- a/contrib/libs/cxxsupp/libcxx/ya.make
+++ b/contrib/libs/cxxsupp/libcxx/ya.make
@@ -35,8 +35,9 @@ ELSEIF (OS_IOS)
     )
 ELSEIF (OS_LINUX OR OS_DARWIN)
     IF (ARCH_ARM7)
-        # XXX: libcxxrt support for ARM is currently broken
-        SET(CXX_RT "glibcxx_static")
+        # libcxxrt support for ARM is currently broken, use libcxxabi instead
+        # But allow switching back to glibcxx_static via -DCXX_RT=glibcxx_static
+        DEFAULT(CXX_RT "libcxxabi")
         # ARM7 OS_SDK has old libstdc++ without aligned allocation support
         CFLAGS(
             GLOBAL -fno-aligned-new
diff --git a/contrib/libs/libunwind/patches/03-unused.patch b/contrib/libs/libunwind/patches/03-unused.patch
index 40011864117..8e34668be94 100644
--- a/contrib/libs/libunwind/patches/03-unused.patch
+++ b/contrib/libs/libunwind/patches/03-unused.patch
@@ -1,27 +1,3 @@
-diff --git a/contrib/libs/libunwind/src/Unwind-EHABI.cpp b/contrib/libs/libunwind/src/Unwind-EHABI.cpp
---- a/contrib/libs/libunwind/src/Unwind-EHABI.cpp
-+++ b/contrib/libs/libunwind/src/Unwind-EHABI.cpp
-@@ -261,7 +261,7 @@
-                       size_t offset, size_t len) {
-   bool wrotePC = false;
-   bool finish = false;
--  bool hasReturnAddrAuthCode = false;
-+  bool hasReturnAddrAuthCode [[maybe_unused]] = false;
-   while (offset < len && !finish) {
-     uint8_t byte = getByte(data, offset++);
-     if ((byte & 0x80) == 0) {
-diff --git a/contrib/libs/libunwind/src/UnwindLevel1.c b/contrib/libs/libunwind/src/UnwindLevel1.c
---- a/contrib/libs/libunwind/src/UnwindLevel1.c
-+++ b/contrib/libs/libunwind/src/UnwindLevel1.c
-@@ -330,7 +330,7 @@
- 
-   // uc is initialized by __unw_getcontext in the parent frame. The first stack
-   // frame walked is unwind_phase2_forced.
--  unsigned framesWalked = 1;
-+  unsigned framesWalked __attribute__((unused)) = 1;
-   // Walk each frame until we reach where search phase said to stop
-   while (__unw_step_stage2(cursor) > 0) {
-
 diff --git a/contrib/libs/libunwind/src/Unwind-wasm.c b/contrib/libs/libunwind/src/Unwind-wasm.c
 --- a/contrib/libs/libunwind/src/Unwind-wasm.c
 +++ b/contrib/libs/libunwind/src/Unwind-wasm.c
diff --git a/contrib/libs/libunwind/src/Unwind-EHABI.cpp b/contrib/libs/libunwind/src/Unwind-EHABI.cpp
index af5daa9f6a4..05475c6ac1e 100644
--- a/contrib/libs/libunwind/src/Unwind-EHABI.cpp
+++ b/contrib/libs/libunwind/src/Unwind-EHABI.cpp
@@ -261,7 +261,7 @@ _Unwind_VRS_Interpret(_Unwind_Context *context, const uint32_t *data,
                       size_t offset, size_t len) {
   bool wrotePC = false;
   bool finish = false;
-  bool hasReturnAddrAuthCode [[maybe_unused]] = false;
+  bool hasReturnAddrAuthCode = false;
   while (offset < len && !finish) {
     uint8_t byte = getByte(data, offset++);
     if ((byte & 0x80) == 0) {
diff --git a/contrib/libs/libunwind/src/UnwindLevel1.c b/contrib/libs/libunwind/src/UnwindLevel1.c
index 17a06189b29..11f3132c94b 100644
--- a/contrib/libs/libunwind/src/UnwindLevel1.c
+++ b/contrib/libs/libunwind/src/UnwindLevel1.c
@@ -356,7 +356,7 @@ unwind_phase2_forced(unw_context_t *uc, unw_cursor_t *cursor,
 
   // uc is initialized by __unw_getcontext in the parent frame. The first stack
   // frame walked is unwind_phase2_forced.
-  unsigned framesWalked __attribute__((unused)) = 1;
+  unsigned framesWalked = 1;
   // Walk each frame until we reach where search phase said to stop
   while (__unw_step_stage2(cursor) > 0) {
 
diff --git a/contrib/libs/openldap/.yandex_meta/__init__.py b/contrib/libs/openldap/.yandex_meta/__init__.py
index 4bba5887a46..58eb8f176f9 100644
--- a/contrib/libs/openldap/.yandex_meta/__init__.py
+++ b/contrib/libs/openldap/.yandex_meta/__init__.py
@@ -13,6 +13,7 @@ def openldap_post_install(self):
     )
     self.yamakes.make_recursive(recurse_from_modules=True)
     with self.yamakes["libraries/liblmdb"] as m:
+        m.after("CFLAGS", Switch({'DEFINED LMDB_IDL_LOGN': Linkable(CFLAGS=["-DMDB_IDL_LOGN=${LMDB_IDL_LOGN}"])}))
         m.after("CFLAGS", Switch(OS_ANDROID=Linkable(CFLAGS=["-DMDB_USE_ROBUST=0"])))
 
 
diff --git a/contrib/libs/openldap/libraries/liblmdb/ya.make b/contrib/libs/openldap/libraries/liblmdb/ya.make
index 3e5c14e6af7..8d387bd6453 100644
--- a/contrib/libs/openldap/libraries/liblmdb/ya.make
+++ b/contrib/libs/openldap/libraries/liblmdb/ya.make
@@ -20,6 +20,12 @@ CFLAGS(
     -DLDAPI_SOCK=\"/run/openldap/ldapi\"
 )
 
+IF (DEFINED LMDB_IDL_LOGN)
+    CFLAGS(
+        -DMDB_IDL_LOGN=${LMDB_IDL_LOGN}
+    )
+ENDIF()
+
 IF (OS_ANDROID)
     CFLAGS(
         -DMDB_USE_ROBUST=0