From patchwork Thu Jan 2 19:28:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 306257 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 380852C00A4 for ; Fri, 3 Jan 2014 06:29:03 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 33F6B8B14C; Thu, 2 Jan 2014 19:29:02 +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 VRlGWSJ1yN68; Thu, 2 Jan 2014 19:29:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 48CE38B040; Thu, 2 Jan 2014 19:29:00 +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 1AA1C1BF86C for ; Thu, 2 Jan 2014 19:28:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 146CA837F9 for ; Thu, 2 Jan 2014 19:28:59 +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 P8-LOCEjs6G4 for ; Thu, 2 Jan 2014 19:28:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from blu0-omc3-s23.blu0.hotmail.com (blu0-omc3-s23.blu0.hotmail.com [65.55.116.98]) by whitealder.osuosl.org (Postfix) with ESMTP id CF00681E9F for ; Thu, 2 Jan 2014 19:28:57 +0000 (UTC) Received: from BLU0-SMTP287 ([65.55.116.74]) by blu0-omc3-s23.blu0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 2 Jan 2014 11:28:56 -0800 X-TMN: [vjaHSaD/Oko6GKdtLu8VjByWN+ml4G8Y] X-Originating-Email: [berndkuhls@hotmail.com] Message-ID: Received: from fli4l.lan.fli4l ([79.247.133.83]) by BLU0-SMTP287.phx.gbl over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Thu, 2 Jan 2014 11:28:54 -0800 Received: from fli4lbuild.lan.fli4l ([192.168.1.50]:40620) by fli4l.lan.fli4l with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1Vynwq-0000wW-BR; Thu, 02 Jan 2014 20:28:52 +0100 From: Bernd Kuhls To: buildroot@busybox.net Date: Thu, 2 Jan 2014 20:28:49 +0100 X-Mailer: git-send-email 1.7.9.5 X-OriginalArrivalTime: 02 Jan 2014 19:28:55.0137 (UTC) FILETIME=[E0291D10:01CF07F0] MIME-Version: 1.0 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 4/4] transmission: Fix build error "conflicting types for 'UTP_Write'" after version bump 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: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net fix taken from http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/ compile tested on arch sh4, fixes http://autobuild.buildroot.org/results/638/63884de929fb7339ebf44b08cb5d1ab30010666a/ should also fix powerpc http://autobuild.buildroot.org/results/eb4/eb486228a11a9602d4bf40e771744d2b2b40508f/ Signed-off-by: Bernd Kuhls --- package/transmission/transmission-fix-utypes.patch | 22 ++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 package/transmission/transmission-fix-utypes.patch diff --git a/package/transmission/transmission-fix-utypes.patch b/package/transmission/transmission-fix-utypes.patch new file mode 100644 index 0000000..74f3d32 --- /dev/null +++ b/package/transmission/transmission-fix-utypes.patch @@ -0,0 +1,22 @@ +diff -uNr transmission-2.82.org/third-party/libutp/utypes.h transmission-2.82/third-party/libutp/utypes.h +--- transmission-2.82.org/third-party/libutp/utypes.h 2013-08-09 04:47:43.000000000 +0200 ++++ transmission-2.82/third-party/libutp/utypes.h 2014-01-02 20:17:18.000000000 +0100 +@@ -35,8 +35,15 @@ + typedef const char * cstr; + typedef char * str; + +-#ifndef __cplusplus +-typedef uint8 bool; +-#endif ++//#ifndef __cplusplus ++//typedef uint8 bool; ++//#endif ++#ifndef __cplusplus ++#ifdef HAVE_STDBOOL_H ++#include ++#else ++typedef uint8 bool; ++#endif ++#endif + + #endif //__UTYPES_H__