jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 16:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

package/redis: Bump version to 3.0.3

Browse Source 
Signed-off-by: Martin Bark <martin@barkynet.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Martin Bark 2015-07-21 14:02:50 +01:00 committed by Thomas Petazzoni
parent ebeac236a4
commit aa24cb8b4f
3 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
package/redis/0001-uclibc.patch
View File

@ -6,40 +6,18 @@ against uclibc. Patch originates from:
Mike Steinert, mike.steinert@gmail.com Mike Steinert, mike.steinert@gmail.com
Signed-off-by: Daniel Price <daniel.price@gmail.com> Signed-off-by: Daniel Price <daniel.price@gmail.com>
[Martin: adapt to 3.0.3]
Signed-off-by: Martin Bark <martin@barkynet.com>
========================================================================= =========================================================================
diff -ur old/src/config.h new/src/config.h diff -ur old/src/config.h new/src/config.h
--- old/src/config.h 2012-10-26 07:20:24.000000000 -0700 --- old/src/config.h 2012-10-26 07:20:24.000000000 -0700
+++ new/src/config.h 2012-10-31 13:41:51.206309564 -0700 +++ new/src/config.h 2012-10-31 13:41:51.206309564 -0700
@@ -1,6 +1,10 @@ @@ -62,7 +62,7 @@
#ifndef __CONFIG_H
#define __CONFIG_H
+#if defined(__unix) || defined(__linux__)
+#include <features.h>
+#endif
+
#ifdef __APPLE__
#include <AvailabilityMacros.h>
#endif
@@ -25,7 +29,7 @@
#endif #endif
/* Test for backtrace() */ /* Test for backtrace() */
-#if defined(__APPLE__) || defined(__linux__) -#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__))
+#if (defined(__APPLE__) || defined(__linux__) && !defined(__UCLIBC__)) +#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__))
#define HAVE_BACKTRACE 1 #define HAVE_BACKTRACE 1
#endif #endif
diff -ur old/src/Makefile new/src/Makefile
--- old/src/Makefile 2012-10-26 07:20:24.000000000 -0700
+++ new/src/Makefile 2012-10-31 13:40:39.224728830 -0700
@@ -135,7 +135,7 @@
echo REDIS_LDFLAGS=$(REDIS_LDFLAGS) >> .make-settings
echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings
echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings
- -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS))
+ -(cd ../deps && $(MAKE) CC="$(CC)" $(DEPENDENCY_TARGETS))
.PHONY: persist-settings

4
package/redis/redis.hash
View File

@ -1,2 +1,2 @@
# Locally calculated # From https://github.com/antirez/redis-hashes/blob/master/README
sha256 29bb08abfc3d392b2f0c3e7f48ec46dd09ab1023f9a5575fc2a93546f4ca5145 redis-2.8.19.tar.gz sha1 0e2d7707327986ae652df717059354b358b83358 redis-3.0.3.tar.gz

2
package/redis/redis.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
REDIS_VERSION = 2.8.19 REDIS_VERSION = 3.0.3
REDIS_SITE = http://download.redis.io/releases REDIS_SITE = http://download.redis.io/releases
REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components)
REDIS_LICENSE_FILES = COPYING REDIS_LICENSE_FILES = COPYING