e5088380d3
Some parts of redis fail to build when ccache is enabled, due to one of our
own patches. The construct
make CC=$(CC) target1 target2
would result in
make CC=ccache <tuple>-gcc target1 target2
and here <tuple>-gcc would be treated as a target and the compiler used
would be just 'ccache'.
Reported-by: Johan Sagaert <sagaert.johan@skynet.be>
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
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
|
|
|