summaryrefslogtreecommitdiffstats
path: root/package/redis/0001-uclibc.patch
diff options
context:
space:
mode:
authorGustavo Zacarias <gustavo@zacarias.com.ar>2015-01-21 09:21:42 -0300
committerPeter Korsgaard <peter@korsgaard.com>2015-01-23 16:45:38 +0100
commitd226500192dcac84e5fdeba6867ee51ceb402c4c (patch)
treeffb853bbf5d781b3d5a94d3a6a9306307a66c06d /package/redis/0001-uclibc.patch
parent9a4d760e1b0d3e4ff81f855486668952a20701df (diff)
downloadbuildroot-d226500192dcac84e5fdeba6867ee51ceb402c4c.tar.gz
buildroot-d226500192dcac84e5fdeba6867ee51ceb402c4c.zip
redis: bump to version 2.8.19
Add hash file. Drop redis-002-lua-AR.patch (upstream). Rename patches to new naming convention. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/redis/0001-uclibc.patch')
-rw-r--r--package/redis/0001-uclibc.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/package/redis/0001-uclibc.patch b/package/redis/0001-uclibc.patch
new file mode 100644
index 0000000000..01657d0ea8
--- /dev/null
+++ b/package/redis/0001-uclibc.patch
@@ -0,0 +1,45 @@
+redis-001-uclibc.patch: This patch fixes redis so that it can be compiled
+against uclibc. Patch originates from:
+
+ Support cross-compiling for uClibc targets
+ https://github.com/antirez/redis/pull/537
+ Mike Steinert, mike.steinert@gmail.com
+
+Signed-off-by: Daniel Price <daniel.price@gmail.com>
+
+=========================================================================
+diff -ur old/src/config.h new/src/config.h
+--- old/src/config.h 2012-10-26 07:20:24.000000000 -0700
++++ new/src/config.h 2012-10-31 13:41:51.206309564 -0700
+@@ -1,6 +1,10 @@
+ #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
+
+ /* Test for backtrace() */
+-#if defined(__APPLE__) || defined(__linux__)
++#if (defined(__APPLE__) || defined(__linux__) && !defined(__UCLIBC__))
+ #define HAVE_BACKTRACE 1
+ #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
+
OpenPOWER on IntegriCloud