From patchwork Sun May 17 14:15:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 473171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id BC537140A98 for ; Mon, 18 May 2015 00:15:59 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id D0292A1611; Sun, 17 May 2015 14:15:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TygktA1ouEYD; Sun, 17 May 2015 14:15:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 24123A15DE; Sun, 17 May 2015 14:15:51 +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 1F54B1BFC15 for ; Sun, 17 May 2015 14:15:47 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 203498BE9C for ; Sun, 17 May 2015 14:15:47 +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 DEhkp4eKf5yQ for ; Sun, 17 May 2015 14:15:46 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (down.free-electrons.com [37.187.137.238]) by whitealder.osuosl.org (Postfix) with ESMTP id 899FC8B504 for ; Sun, 17 May 2015 14:15:46 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id 9A30C24D; Sun, 17 May 2015 16:15:50 +0200 (CEST) Received: from localhost (132.230.147.77.rev.sfr.net [77.147.230.132]) by mail.free-electrons.com (Postfix) with ESMTPSA id 40180249; Sun, 17 May 2015 16:15:50 +0200 (CEST) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Sun, 17 May 2015 16:15:40 +0200 Message-Id: <1431872140-765-3-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1431872140-765-1-git-send-email-thomas.petazzoni@free-electrons.com> References: <1431872140-765-1-git-send-email-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 3/3] lirc-tools: fix static library build caused by 'loglevel' redefinition X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" This commit adds a patch to lirc-tools to fix static library builds caused by the redefinition of the loglevel variable. Fixes: http://autobuild.buildroot.org/results/2ac/2ac6a4f946d48cacff85d44d662e1c103f7443f8/ Signed-off-by: Thomas Petazzoni --- ...vel-redefinition-in-static-library-builds.patch | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 package/lirc-tools/0003-Fix-loglevel-redefinition-in-static-library-builds.patch diff --git a/package/lirc-tools/0003-Fix-loglevel-redefinition-in-static-library-builds.patch b/package/lirc-tools/0003-Fix-loglevel-redefinition-in-static-library-builds.patch new file mode 100644 index 0000000..1e8717c --- /dev/null +++ b/package/lirc-tools/0003-Fix-loglevel-redefinition-in-static-library-builds.patch @@ -0,0 +1,49 @@ +From 2a789161ef17ac1cedd9a4eb11423f6c1020d8d9 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni +Date: Sun, 17 May 2015 16:08:15 +0200 +Subject: [PATCH] Fix loglevel redefinition in static library builds + +Signed-off-by: Thomas Petazzoni +--- + daemons/lircmd.c | 1 - + tools/irrecord.c | 5 ++--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/daemons/lircmd.c b/daemons/lircmd.c +index 023777c..e69078c 100644 +--- a/daemons/lircmd.c ++++ b/daemons/lircmd.c +@@ -67,7 +67,6 @@ typedef uint64_t __u64; + + static int uinputfd = -1; + static int useuinput = 0; +-loglevel_t loglevel = 0; + + + static const struct option lircmd_options[] = { +diff --git a/tools/irrecord.c b/tools/irrecord.c +index f52328c..772b090 100644 +--- a/tools/irrecord.c ++++ b/tools/irrecord.c +@@ -113,9 +113,6 @@ lirc_t aeps = 100; + + #define SAMPLES 80 + +-// Actual loglevel as per -D option, see lirc_log.h. +-loglevel_t loglevel = LIRC_WARNING; +- + int daemonized = 0; + + struct ir_remote *emulation_data; +@@ -407,6 +404,8 @@ int main(int argc, char **argv) + char commandline[128]; + char path[128]; + int get_pre = 0, get_post = 0, test = 0, invert = 0, trail = 0; ++ // Actual loglevel as per -D option, see lirc_log.h. ++ loglevel_t loglevel = LIRC_WARNING; + + get_commandline(argc, argv, commandline, sizeof(commandline)); + force = 0; +-- +2.1.0 +