Merge pull request #13829 from ja-pa/redis-6.0.9

redis: update to version 6.0.9
This commit is contained in:
Rosen Penev 2020-11-10 22:40:31 -08:00 committed by GitHub
commit ebb6d77272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 16 deletions

View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=redis
PKG_VERSION:=6.0.8
PKG_VERSION:=6.0.9
PKG_RELEASE:=1
PKG_SOURCE_URL:=http://download.redis.io/releases/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_HASH:=04fa1fddc39bd1aecb6739dd5dd73858a3515b427acd1e2947a66dadce868d68
PKG_HASH:=dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd
PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec@nic.cz>
PKG_LICENSE:=BSD-3-Clause

View file

@ -1,7 +1,5 @@
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

View file

@ -11,13 +11,13 @@
#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