From patchwork Tue Feb 24 08:24:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Boibessot X-Patchwork-Id: 442830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 40658140159 for ; Tue, 24 Feb 2015 19:25:10 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 87F3E8B826; Tue, 24 Feb 2015 08:25:09 +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 ruj7cupgd59t; Tue, 24 Feb 2015 08:25:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 3ECF5919AB; Tue, 24 Feb 2015 08:25:08 +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 93D6E1C1F92 for ; Tue, 24 Feb 2015 08:25:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8E2538B826 for ; Tue, 24 Feb 2015 08:25:06 +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 RpShZOfnLUPY for ; Tue, 24 Feb 2015 08:25:05 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp5-g21.free.fr (smtp5-g21.free.fr [212.27.42.5]) by whitealder.osuosl.org (Postfix) with ESMTPS id 26E5991931 for ; Tue, 24 Feb 2015 08:25:05 +0000 (UTC) Received: from localhost.localdomain (unknown [82.234.232.91]) by smtp5-g21.free.fr (Postfix) with ESMTP id CE5A7D480D2; Tue, 24 Feb 2015 09:24:50 +0100 (CET) From: julien.boibessot@free.fr To: buildroot@busybox.net Date: Tue, 24 Feb 2015 09:24:41 +0100 Message-Id: <1424766281-8272-1-git-send-email-julien.boibessot@free.fr> X-Mailer: git-send-email 1.7.9.5 Cc: Julien Boibessot Subject: [Buildroot] [PATCH] package/opentyrian: bump to latest revision. 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" From: Julien Boibessot Since commit 120a3efeec66dbbade3d8213682c0a8940c906eb from Romain, Opentyrian upstream has fixed the build problem on Blackfin (in a slightly different way). So bump to latest revision to not keep the fix in BR. Signed-off-by: Julien Boibessot Reviewed-by: Romain Naour Tested-by: Romain Naour --- ...-don-t-redefine-strchrnul-for-unix-system.patch | 42 -------------------- package/opentyrian/opentyrian.mk | 6 +-- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 package/opentyrian/0001-mingw_fixes-don-t-redefine-strchrnul-for-unix-system.patch diff --git a/package/opentyrian/0001-mingw_fixes-don-t-redefine-strchrnul-for-unix-system.patch b/package/opentyrian/0001-mingw_fixes-don-t-redefine-strchrnul-for-unix-system.patch deleted file mode 100644 index e20ab00..0000000 --- a/package/opentyrian/0001-mingw_fixes-don-t-redefine-strchrnul-for-unix-system.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1c64c2d103c9356750a3d3b559068329bb0c7e3c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 20 Feb 2015 00:29:47 +0100 -Subject: [PATCH] mingw_fixes: don't redefine strchrnul for unix system - -On bfin architecture all symbols are prefixed with a underscore '_', hence a -conflict with the _strchrnul symbole from mingw_fixes.c and the one from uClibc. - -Path/to/sysroot/usr/lib/libc.a(strchrnul.o): In function `*___GI_strchrnul': -Path/to/uClibc/libc/string/generic/strchrnul.c:33: multiple definition of `_strchrnul' -obj/mingw_fixes.o:src/mingw_fixes.c:(.text+0x0): first defined here - -Since mingw_fixes.c is intended for WIN32 system, add a guard around strchrnul function -and use the one defined from string.h. - -Fixes: -http://autobuild.buildroot.net/results/a08/a085fb55269971e3c7b8ae8c167e7330c3c042a5/ - -Signed-off-by: Romain Naour ---- - src/mingw_fixes.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/mingw_fixes.c b/src/mingw_fixes.c -index d734438..2f4069e 100644 ---- a/src/mingw_fixes.c -+++ b/src/mingw_fixes.c -@@ -18,9 +18,11 @@ - */ - #include "mingw_fixes.h" - -+#ifndef TARGET_UNIX - char *strchrnul( const char *s, int c ) - { - for (; *s != c && *s != '\0'; ++s) - ; - return (char *)s; - } -+#endif --- -1.9.3 - diff --git a/package/opentyrian/opentyrian.mk b/package/opentyrian/opentyrian.mk index f00a52b..3dc5af5 100644 --- a/package/opentyrian/opentyrian.mk +++ b/package/opentyrian/opentyrian.mk @@ -4,9 +4,9 @@ # ################################################################################ -OPENTYRIAN_VERSION = 2.1.20130907 -OPENTYRIAN_SITE = http://www.camanis.net/opentyrian/releases -OPENTYRIAN_SOURCE = opentyrian-$(OPENTYRIAN_VERSION)-src.tar.gz +OPENTYRIAN_VERSION = 9c9f0ec3532b +OPENTYRIAN_SITE = https://code.google.com/p/opentyrian/ +OPENTYRIAN_SITE_METHOD = hg OPENTYRIAN_LICENSE = GPLv2+ OPENTYRIAN_LICENSE_FILES = COPYING