diff options
| author | Jan Pavlinec <jan.pavlinec@nic.cz> | 2020-11-02 13:24:31 +0100 |
|---|---|---|
| committer | Jan Pavlinec <jan.pavlinec@nic.cz> | 2020-11-10 12:42:55 +0100 |
| commit | 31712998888e556cd1b59bfe1821065a3bb78fc3 (patch) | |
| tree | 1cd06a596e186f9773a17436e673d709391e2de5 /libs/redis/patches | |
| parent | 6e3c3c4b7c487b7f62821ad5bb7c74af014a9108 (diff) | |
redis: update to version 6.0.9
Patches were adjusted to the new version.
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
Diffstat (limited to 'libs/redis/patches')
| -rw-r--r-- | libs/redis/patches/020-fix-atomicvar.patch | 16 | ||||
| -rw-r--r-- | libs/redis/patches/030-fix-uclibc-compilation.patch | 10 |
2 files changed, 12 insertions, 14 deletions
diff --git a/libs/redis/patches/020-fix-atomicvar.patch b/libs/redis/patches/020-fix-atomicvar.patch index ad6519e48..01c18eab2 100644 --- a/libs/redis/patches/020-fix-atomicvar.patch +++ b/libs/redis/patches/020-fix-atomicvar.patch @@ -1,22 +1,20 @@ -Index: redis-5.0.0/src/atomicvar.h -=================================================================== ---- redis-5.0.0.orig/src/atomicvar.h -+++ redis-5.0.0/src/atomicvar.h +--- a/src/atomicvar.h ++++ b/src/atomicvar.h @@ -68,7 +68,7 @@ * is reported. */ // #define __ATOMIC_VAR_FORCE_SYNC_MACROS - + -#if !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) +#if defined(CONFIG_EDAC_ATOMIC_SCRUB) && !defined(__ATOMIC_VAR_FORCE_SYNC_MACROS) && defined(__ATOMIC_RELAXED) && !defined(__sun) && (!defined(__clang__) || !defined(__APPLE__) || __apple_build_version__ > 4210057) /* Implementation using __atomic macros. */ - + #define atomicIncr(var,count) __atomic_add_fetch(&var,(count),__ATOMIC_RELAXED) @@ -82,7 +82,7 @@ #define atomicSet(var,value) __atomic_store_n(&var,value,__ATOMIC_RELAXED) #define REDIS_ATOMIC_API "atomic-builtin" - + -#elif defined(HAVE_ATOMIC) +#elif defined(CONFIG_EDAC_ATOMIC_SCRUB) && defined(HAVE_ATOMIC) /* Implementation using __sync macros. */ - - #define atomicIncr(var,count) __sync_add_and_fetch(&var,(count))
\ No newline at end of file + + #define atomicIncr(var,count) __sync_add_and_fetch(&var,(count)) diff --git a/libs/redis/patches/030-fix-uclibc-compilation.patch b/libs/redis/patches/030-fix-uclibc-compilation.patch index 0fc39b02d..cb154910f 100644 --- a/libs/redis/patches/030-fix-uclibc-compilation.patch +++ b/libs/redis/patches/030-fix-uclibc-compilation.patch @@ -3,7 +3,7 @@ @@ -30,6 +30,10 @@ #ifndef __CONFIG_H #define __CONFIG_H - + +#if defined(__unix) || defined(__linux__) +#include <features.h> +#endif @@ -11,15 +11,15 @@ #ifdef __APPLE__ #include <AvailabilityMacros.h> #endif -@@ -62,9 +66,9 @@ +@@ -63,9 +67,9 @@ #endif - + /* Test for backtrace() */ -#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \ +#if (defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) || \ - defined(__FreeBSD__) || (defined(__OpenBSD__) && defined(USE_BACKTRACE))\ + defined(__FreeBSD__) || ((defined(__OpenBSD__) || defined(__NetBSD__)) && defined(USE_BACKTRACE))\ - || defined(__DragonFly__) + || defined(__DragonFly__)) && !defined(__UCLIBC__) #define HAVE_BACKTRACE 1 #endif - + |