From patchwork Sat Jan 5 22:40:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 209702 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 246642C0086 for ; Sun, 6 Jan 2013 09:40:48 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 914D91FE78; Sat, 5 Jan 2013 22:40:45 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gQ7OX10-3R5J; Sat, 5 Jan 2013 22:40:43 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E41DB200E4; Sat, 5 Jan 2013 22:40:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E380F8F753 for ; Sat, 5 Jan 2013 22:40:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C8B448BC5E for ; Sat, 5 Jan 2013 22:40:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wJV04Dwt+m9X for ; Sat, 5 Jan 2013 22:40:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f176.google.com (mail-we0-f176.google.com [74.125.82.176]) by whitealder.osuosl.org (Postfix) with ESMTPS id 3C93B8B47F for ; Sat, 5 Jan 2013 22:40:40 +0000 (UTC) Received: by mail-we0-f176.google.com with SMTP id r5so8883152wey.35 for ; Sat, 05 Jan 2013 14:40:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=GGPVSDccouuCEDb1O4RvDOQ+2MOrE+K4rzXUS/qk5NE=; b=MF0q2L30VAh2vdJMy08q6V9KIAM/fp/78zsrZjVtOufwocFn5B+WkGkDtwxp8VNUoG TO/8e0ZjqmkTh3UFzAwORFn5q8CnIvP/VPBRj7xY2vzn8tLBIi/CM7rReOH61ZQDvgAo BkQRYHJ1/Q4iQ1WC+ANAkvOziZBtiev2VC1k5tOHzgzCRmq10WwSq7AqC0OA24s1f4xV COQ77NQNTu6g+DUCh8ulGHMY91JRGJfhdIWDc9trMcsTTpzm9+WEYZj5tXjCdMZAcrtl bEW8wB76uFK/QSr5RCz03mkuEkDe5hGgPIxxLy4Uct8HuHAVgqyFpCAy/t/d96sVlelf Ak8w== X-Received: by 10.194.76.137 with SMTP id k9mr89967412wjw.29.1357425638569; Sat, 05 Jan 2013 14:40:38 -0800 (PST) Received: from localhost.localdomain (ARennes-256-1-70-176.w90-32.abo.wanadoo.fr. [90.32.149.176]) by mx.google.com with ESMTPS id u6sm5893402wif.2.2013.01.05.14.40.36 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 05 Jan 2013 14:40:37 -0800 (PST) From: "Yann E. MORIN" To: buildroot@busybox.net Date: Sat, 5 Jan 2013 23:40:33 +0100 Message-Id: <1357425633-11040-1-git-send-email-yann.morin.1998@free.fr> X-Mailer: git-send-email 1.7.2.5 Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH] pacakge/tvheadend: fix failures due to -Werror X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net (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" Cc: Peter Korsgaard --- package/tvheadend/tvheadend-fix-Werror.patch | 44 ++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) create mode 100644 package/tvheadend/tvheadend-fix-Werror.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 +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" : + 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;