diff options
| author | robot-piglet <robot-piglet@yandex-team.com> | 2025-02-03 19:15:43 +0300 |
|---|---|---|
| committer | robot-piglet <robot-piglet@yandex-team.com> | 2025-02-03 19:29:25 +0300 |
| commit | 77ee0394b2632327b0789f4adc0434ee90856ef2 (patch) | |
| tree | 66ec010a4bc6dcba79e12d1766d19c3bb97282c2 /contrib | |
| parent | ca1b99bb0935aa604330db8d93bb366bc4bb10c9 (diff) | |
| download | ydb-77ee0394b2632327b0789f4adc0434ee90856ef2.tar.gz | |
Intermediate changes
commit_hash:1cef0cf05075cdc1ff60c3675d89b7135b260071
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym | 5 | ||||
| -rw-r--r-- | contrib/libs/cxxsupp/libcxx/ya.make | 5 | ||||
| -rw-r--r-- | contrib/libs/openldap/.yandex_meta/__init__.py | 1 | ||||
| -rw-r--r-- | contrib/libs/openldap/libraries/liblmdb/ya.make | 6 |
4 files changed, 13 insertions, 4 deletions
diff --git a/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym b/contrib/libs/cxxsupp/libcxx/.yandex_meta/build.ym index 2ba2f81dd1..87c16c302e 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 7f7045a21e..a3f6634764 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/openldap/.yandex_meta/__init__.py b/contrib/libs/openldap/.yandex_meta/__init__.py index 4bba5887a4..58eb8f176f 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 3e5c14e6af..8d387bd645 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 |