diff options
| author | Alexander Smirnov <alex@ydb.tech> | 2025-03-14 00:51:45 +0000 |
|---|---|---|
| committer | Alexander Smirnov <alex@ydb.tech> | 2025-03-14 00:51:45 +0000 |
| commit | 3e3d50dea42f66b1ba457411b8864990f90bbe21 (patch) | |
| tree | 7d75df352fc045a84d46764b96b496b5775bbf44 /contrib/libs | |
| parent | 7778cd274683ce11e318b799ea12c7bc0b3a4bdd (diff) | |
| parent | 422642b601155a296cb0a69eb9b1f7ba146ffa49 (diff) | |
| download | ydb-3e3d50dea42f66b1ba457411b8864990f90bbe21.tar.gz | |
Merge branch 'rightlib' into merge-libs-250314-0050
Diffstat (limited to 'contrib/libs')
| -rw-r--r-- | contrib/libs/croaring/.yandex_meta/override.nix | 4 | ||||
| -rw-r--r-- | contrib/libs/croaring/include/roaring/portability.h | 5 | ||||
| -rw-r--r-- | contrib/libs/croaring/include/roaring/roaring_version.h | 4 | ||||
| -rw-r--r-- | contrib/libs/croaring/ya.make | 4 |
4 files changed, 8 insertions, 9 deletions
diff --git a/contrib/libs/croaring/.yandex_meta/override.nix b/contrib/libs/croaring/.yandex_meta/override.nix index b259cae422..60171a848a 100644 --- a/contrib/libs/croaring/.yandex_meta/override.nix +++ b/contrib/libs/croaring/.yandex_meta/override.nix @@ -1,12 +1,12 @@ pkgs: attrs: with pkgs; with attrs; rec { pname = "croaring"; - version = "4.2.2"; + version = "4.2.3"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; rev = "v${version}"; - hash = "sha256-QaCYtuUU7hZ03x/bPEGG7jUlzbRNMGwi9s/hIHyd3U4="; + hash = "sha256-1yklwZj12yeGg8a/oss4EUHj8eezhKuo4PUltVdaXaM="; }; patches = []; diff --git a/contrib/libs/croaring/include/roaring/portability.h b/contrib/libs/croaring/include/roaring/portability.h index 2db112504c..8c6d3c2bac 100644 --- a/contrib/libs/croaring/include/roaring/portability.h +++ b/contrib/libs/croaring/include/roaring/portability.h @@ -56,12 +56,11 @@ #ifndef _POSIX_C_SOURCE #define _POSIX_C_SOURCE 200809L #endif // !(defined(_POSIX_C_SOURCE)) || (_POSIX_C_SOURCE < 200809L) -#if !(defined(_XOPEN_SOURCE)) || (_XOPEN_SOURCE < 700) -#define _XOPEN_SOURCE 700 -#endif // !(defined(_XOPEN_SOURCE)) || (_XOPEN_SOURCE < 700) #ifdef __illumos__ +#ifndef __EXTENSIONS__ #define __EXTENSIONS__ +#endif // __EXTENSIONS__ #endif #include <stdbool.h> diff --git a/contrib/libs/croaring/include/roaring/roaring_version.h b/contrib/libs/croaring/include/roaring/roaring_version.h index 84618b27ca..98819566a8 100644 --- a/contrib/libs/croaring/include/roaring/roaring_version.h +++ b/contrib/libs/croaring/include/roaring/roaring_version.h @@ -2,11 +2,11 @@ // /include/roaring/roaring_version.h automatically generated by release.py, do not change by hand #ifndef ROARING_INCLUDE_ROARING_VERSION #define ROARING_INCLUDE_ROARING_VERSION -#define ROARING_VERSION "4.2.2" +#define ROARING_VERSION "4.2.3" enum { ROARING_VERSION_MAJOR = 4, ROARING_VERSION_MINOR = 2, - ROARING_VERSION_REVISION = 2 + ROARING_VERSION_REVISION = 3 }; #endif // ROARING_INCLUDE_ROARING_VERSION // clang-format on
\ No newline at end of file diff --git a/contrib/libs/croaring/ya.make b/contrib/libs/croaring/ya.make index 40a975908d..b50e7eaa5e 100644 --- a/contrib/libs/croaring/ya.make +++ b/contrib/libs/croaring/ya.make @@ -10,9 +10,9 @@ LICENSE( LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(4.2.2) +VERSION(4.2.3) -ORIGINAL_SOURCE(https://github.com/RoaringBitmap/CRoaring/archive/v4.2.2.tar.gz) +ORIGINAL_SOURCE(https://github.com/RoaringBitmap/CRoaring/archive/v4.2.3.tar.gz) ADDINCL( GLOBAL contrib/libs/croaring/include |