ofono: fix build on uClibc without backtrace support
authorPeter Korsgaard <jacmet@sunsite.dk>
Tue, 29 May 2012 07:48:00 +0000 (09:48 +0200)
committerPeter Korsgaard <jacmet@sunsite.dk>
Tue, 29 May 2012 07:52:55 +0000 (09:52 +0200)
Identical to connman patch as this code seems to be cut'n'pasted.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/ofono/ofono-uclibc-backtrace.patch [new file with mode: 0644]

diff --git a/package/ofono/ofono-uclibc-backtrace.patch b/package/ofono/ofono-uclibc-backtrace.patch
new file mode 100644 (file)
index 0000000..8499bcf
--- /dev/null
@@ -0,0 +1,44 @@
+[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE
+
+Backtrace support is only used for logging on signal errors, which
+isn't really critical, so simply remove backtrace info if not
+available in uClibc.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/log.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: ofono-1.5/src/log.c
+===================================================================
+--- ofono-1.5.orig/src/log.c
++++ ofono-1.5/src/log.c
+@@ -30,7 +30,12 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <syslog.h>
++#include <features.h>
++/* backtrace support is optional on uClibc */
++#if !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__))
++#define HAVE_BACKTRACE
+ #include <execinfo.h>
++#endif
+ #include <dlfcn.h>
+ #include "ofono.h"
+@@ -115,6 +120,7 @@
+ static void print_backtrace(unsigned int offset)
+ {
++#ifdef HAVE_BACKTRACE
+       void *frames[99];
+       size_t n_ptrs;
+       unsigned int i;
+@@ -213,6 +219,7 @@
+       close(outfd[1]);
+       close(infd[0]);
++#endif /* HAVE_BACKTRACE */
+ }
+ static void signal_handler(int signo)