package/opentyrian: bump to latest revision.

PATCH New julien.boibessot at free.fr 3 participants 3 messages Feb 24, 2015 – Mar 8, 2015

lore

Share & tools

lore

julien.boibessot at free.fr

author

2015-02-24 08:24 UTC #0 lore raw

PATCH 1/1 package/opentyrian: bump to latest revision.

From: Julien Boibessot <[email protected]>

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 <[email protected]>

---
 ...-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

package/opentyrian/0001-mingw_fixes-don-t-redefine-strchrnul-for-unix-system.patch deleted +0 ~~-42~~

deleted file mode 100644
index e20ab00..0000000
@@ -1,42 +0,0 @@
-From 1c64c2d103c9356750a3d3b559068329bb0c7e3c Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-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 <[email protected]>
----
- 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
-

package/opentyrian/opentyrian.mk +3 -3

index f00a52b..3dc5af5 100644
@@ -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

Signature · 1 line

1.7.9.5

Romain Naour

2015-03-04 22:35 UTC #1 lore raw

PATCH 1/1 package/opentyrian: bump to latest revision.

Hi Julien,

Le 24/02/2015 09:24, julien.boibessot at free.fr a ?crit :

Quoted 8 lines

From: Julien Boibessot <[email protected]>
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 <[email protected]>
---

Build tested with bfin toolchain.

Reviewed-by Romain Naour <[email protected]>

Tested-by Romain Naour <[email protected]>

Best regards,
Romain

Quoted 71 lines

 ...-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

package/opentyrian/0001-mingw_fixes-don-t-redefine-strchrnul-for-unix-system.patch deleted +0 ~~-42~~

deleted file mode 100644
index e20ab00..0000000
@@ -1,42 +0,0 @@
-From 1c64c2d103c9356750a3d3b559068329bb0c7e3c Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-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 <[email protected]>
----
- 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
-

package/opentyrian/opentyrian.mk +3 -3

index f00a52b..3dc5af5 100644
@@ -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

Signature · 8 lines

Romain Naour

OPEN WIDE Ing?nierie - Paris
23/25, rue Daviel| 75013 PARIS
http://ingenierie.openwide.fr

Le blog des technologies libres et embarqu?es :
http://www.linuxembedded.fr

Thomas Petazzoni

Applied

2015-03-08 21:20 UTC #2 lore raw

PATCH 1/1 package/opentyrian: bump to latest revision.

In reply to julien.boibessot at free.fr

Julien,

Quoted 7 lines · julien.boibessot at free.fr

From: Julien Boibessot <[email protected]>
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 <[email protected]>

Applied, thanks!

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com