Browse Source

Merge pull request #14496 from neheb/r

redis: update to 6.0.10
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
ceca57da3e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 27 deletions
  1. +2
    -2
      libs/redis/Makefile
  2. +0
    -25
      libs/redis/patches/030-fix-uclibc-compilation.patch

+ 2
- 2
libs/redis/Makefile View File

@ -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 <jan.pavlinec@nic.cz>
PKG_LICENSE:=BSD-3-Clause


+ 0
- 25
libs/redis/patches/030-fix-uclibc-compilation.patch View File

@ -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 <features.h>
+#endif
+
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#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

Loading…
Cancel
Save