From fb793f6215a16f27a39d3f94d45bec061e371d49 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Sun, 17 Jan 2021 14:15:31 -0800 Subject: [PATCH] redis: update to 6.0.10 Remove uClibc-ng patch as it's not in the tree anymore. Signed-off-by: Rosen Penev --- libs/redis/Makefile | 4 +-- .../patches/030-fix-uclibc-compilation.patch | 25 ------------------- 2 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 libs/redis/patches/030-fix-uclibc-compilation.patch diff --git a/libs/redis/Makefile b/libs/redis/Makefile index f9cf53843..b57849fe3 100644 --- a/libs/redis/Makefile +++ b/libs/redis/Makefile @@ -1,12 +1,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=redis -PKG_VERSION:=6.0.9 +PKG_VERSION:=6.0.10 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://download.redis.io/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_HASH:=dc2bdcf81c620e9f09cfd12e85d3bc631c897b2db7a55218fd8a65eaa37f86dd +PKG_HASH:=79bbb894f9dceb33ca699ee3ca4a4e1228be7fb5547aeb2f99d921e86c1285bd PKG_MAINTAINER:=Jan Pavlinec PKG_LICENSE:=BSD-3-Clause diff --git a/libs/redis/patches/030-fix-uclibc-compilation.patch b/libs/redis/patches/030-fix-uclibc-compilation.patch deleted file mode 100644 index cb154910f..000000000 --- a/libs/redis/patches/030-fix-uclibc-compilation.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/src/config.h -+++ b/src/config.h -@@ -30,6 +30,10 @@ - #ifndef __CONFIG_H - #define __CONFIG_H - -+#if defined(__unix) || defined(__linux__) -+#include -+#endif -+ - #ifdef __APPLE__ - #include - #endif -@@ -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(__NetBSD__)) && defined(USE_BACKTRACE))\ -- || defined(__DragonFly__) -+ || defined(__DragonFly__)) && !defined(__UCLIBC__) - #define HAVE_BACKTRACE 1 - #endif -