Patchwork pacakge/tvheadend: fix failures due to -Werror

login
register
mail settings
Submitter Yann E. MORIN
Date Jan. 5, 2013, 10:40 p.m.
Message ID <1357425633-11040-1-git-send-email-yann.morin.1998@free.fr>
Download mbox | patch
Permalink /patch/209702/
State Accepted
Commit 81faecdb9b43ab9f31b7b2a443238c7c78915129
Headers show

Comments

Yann E. MORIN - Jan. 5, 2013, 10:40 p.m.
(Partially) apply upstream patch 1334869bf0ea668e58e1c72daa3c09c1a95b5d81
to properly protect code-paths depending on execinfo.h (for backtrace(3)).

Fixes:
    http://autobuild.buildroot.net/results/fe25485bde8894daff5bdf806eb4bb2fa776dc55/

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <jacmet@uclibc.org>
---
 package/tvheadend/tvheadend-fix-Werror.patch |   44 ++++++++++++++++++++++++++
 1 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 package/tvheadend/tvheadend-fix-Werror.patch
Peter Korsgaard - Jan. 6, 2013, 8:17 p.m.
>>>>> "Yann" == Yann E MORIN <yann.morin.1998@free.fr> writes:

 Yann> (Partially) apply upstream patch 1334869bf0ea668e58e1c72daa3c09c1a95b5d81
 Yann> to properly protect code-paths depending on execinfo.h (for backtrace(3)).

 Yann> Fixes:
 Yann>     http://autobuild.buildroot.net/results/fe25485bde8894daff5bdf806eb4bb2fa776dc55/

 Yann> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
 Yann> Cc: Peter Korsgaard <jacmet@uclibc.org>

Committed, thanks.

Patch

diff --git a/package/tvheadend/tvheadend-fix-Werror.patch b/package/tvheadend/tvheadend-fix-Werror.patch
new file mode 100644
index 0000000..5f6dbad
--- /dev/null
+++ b/package/tvheadend/tvheadend-fix-Werror.patch
@@ -0,0 +1,44 @@ 
+commit 1334869bf0ea668e58e1c72daa3c09c1a95b5d81
+Author: Alexey I. Froloff <raorn@raorn.name>
+Date:   Wed Oct 24 21:10:15 2012 +0400
+
+    [PR-172] Fix compilatioin issues on OpenWRT
+    
+    Fix SHA1_* function names
+    Fix unused variables and functions
+
+---
+"Yann E. MORIN" <yann.morin.1998@free.fr>:
+    For buildroot, I removed the SHA_* fixes, as we're not affected.
+    No point in fixing something that does not bug us.
+
+diff --git a/src/trap.c b/src/trap.c
+index bd76118..b0fe543 100644
+--- a/src/trap.c
++++ b/src/trap.c
+@@ -67,6 +67,7 @@ sappend(char *buf, size_t l, const char *fmt, ...)
+ /**
+  *
+  */
++#if ENABLE_EXECINFO
+ static int
+ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
+ {
+@@ -126,6 +127,7 @@ add2lineresolve(const char *binary, void *addr, char *buf0, size_t buflen)
+   close(fd[0]);
+   return 0;
+ }
++#endif /* ENABLE_EXECINFO */
+ 
+ 
+ 
+@@ -133,8 +135,8 @@ static void
+ traphandler(int sig, siginfo_t *si, void *UC)
+ {
+   ucontext_t *uc = UC;
+-  char buf[200];
+ #if ENABLE_EXECINFO
++  char buf[200];
+   static void *frames[MAXFRAMES];
+   int nframes = backtrace(frames, MAXFRAMES);
+   Dl_info dli;