From 5b13261dc7be4b82d8e64b08744569090b7da71c Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 25 Mar 2013 11:15:34 +0000 Subject: redis: build fix and minor improvement The redis-001-uclibc.patch was properly adding conditionals to ensure HAVE_BACKTRACE is not defined when uClibc is used. However, __unix doesn't seem to be define with the toolchain Peter uses on gcc14, so the doesn't get included, therefore __UCLIBC isn't defined, and the code believes that backtrace support is available. We fix this by including when __linux__ is defined. Fixes: http://autobuild.buildroot.org/results/4ba818f877af145a547a1fede0bb738192c2f181/build-end.log. Also add another patch that do not redefine the _LARGEFILE_SOURCE and _FILE_OFFSET_BITS macros if they are already defined on the command line. It avoids the ugly warnings that we could see from the build logs, and therefore make it easier to spot real errors. Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/redis/redis-001-uclibc.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/redis/redis-001-uclibc.patch') diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch index d7fd9c3c5..8762ca2fb 100644 --- a/package/redis/redis-001-uclibc.patch +++ b/package/redis/redis-001-uclibc.patch @@ -15,7 +15,7 @@ diff -ur old/src/config.h new/src/config.h #ifndef __CONFIG_H #define __CONFIG_H -+#ifdef __unix ++#if defined(__unix) || defined(__linux__) +#include +#endif + -- cgit v1.2.3