[Buildroot] [PATCH 1/2] tinycbor: bump to version 0.3.2

[Buildroot] [PATCH 1/2] tinycbor: bump to version 0.3.2

[Fabrice Fontaine]

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
---
 ...e-installation-logic-compatible-with-old-.patch | 59 ----------------------
 package/tinycbor/tinycbor.hash                     |  2 +-
 package/tinycbor/tinycbor.mk                       |  2 +-
 3 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 package/tinycbor/0001-Makefile-use-installation-logic-compatible-with-old-.patch

diff --git a/package/tinycbor/0001-Makefile-use-installation-logic-compatible-with-old-.patch b/package/tinycbor/0001-Makefile-use-installation-logic-compatible-with-old-.patch
deleted file mode 100644
index 8ab6955..0000000
--- a/package/tinycbor/0001-Makefile-use-installation-logic-compatible-with-old-.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 1d92e2a4af056466dcbefd09750bce07cf1085ed Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Sat, 30 Jul 2016 18:42:53 +0200
-Subject: [PATCH] Makefile: use installation logic compatible with old make
- version
-
-The installation logic used by the Makefile causes a problem with old
-make versions, such as make 3.81. Indeed, the rule "$(DESTDIR)%/" gets
-matched even for targets like "$(DESTDIR)$(libdir)/libtinycbor.a". Due
-to this, with those old make versions, tinycbor.a is installed as a
-directory, and the library is never copied:
-
-make[1]: Entering directory `/home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/build/tinycbor-v0.3.1'
-install -d /home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/target/usr/bin/cbordump
-install -d /home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/target/usr/lib/libtinycbor.a
-install -d /home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/target/usr/lib/pkgconfig/tinycbor.pc
-install -d /home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/target/usr/include/tinycbor/cbor.h
-install -d /home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/target/usr/include/tinycbor/cborjson.h
-make[1]: Leaving directory `/home/test/outputs/b1305500555cbb5b959e5be11dee5cf75907f0ce/output/build/tinycbor-v0.3.1'
-
-To address this, we create the destination directory directly within
-the per-file make targets.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- Makefile | 14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0692f6b..94beaf8 100644
---- a/Makefile
-+++ b/Makefile
-@@ -123,15 +123,17 @@ $(PACKAGE).tar.gz: | .git
- $(PACKAGE).zip: | .git
- 	GIT_DIR=$(SRCDIR).git $(GIT_ARCHIVE) --format=zip -o "$(PACKAGE).zip" HEAD
- 
--$(DESTDIR)%/:
--	$(INSTALL) -d $@
--$(DESTDIR)$(libdir)/%: lib/% | $(DESTDIR)$(libdir)/
-+$(DESTDIR)$(libdir)/%: lib/%
-+	$(INSTALL) -d $(@D)
- 	$(INSTALL_DATA) $< $@
--$(DESTDIR)$(bindir)/%: bin/% | $(DESTDIR)$(bindir)/
-+$(DESTDIR)$(bindir)/%: bin/%
-+	$(INSTALL) -d $(@D)
- 	$(INSTALL_PROGRAM) $< $@
--$(DESTDIR)$(pkgconfigdir)/%: % | $(DESTDIR)$(pkgconfigdir)/
-+$(DESTDIR)$(pkgconfigdir)/%: %
-+	$(INSTALL) -d $(@D)
- 	$(INSTALL_DATA) $< $@
--$(DESTDIR)$(includedir)/tinycbor/%: src/% | $(DESTDIR)$(includedir)/tinycbor/
-+$(DESTDIR)$(includedir)/tinycbor/%: src/%
-+	$(INSTALL) -d $(@D)
- 	$(INSTALL_DATA) $< $@
- 
- install-strip:
--- 
-2.7.4
-
diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash
index e60a86c..258e0e6 100644
--- a/package/tinycbor/tinycbor.hash
+++ b/package/tinycbor/tinycbor.hash
@@ -1,2 +1,2 @@
 # Locally computed:
-sha256	e73a617b3a51fac103df1faab9ea037e509c1491cca29c1fd4b5083d74267597	tinycbor-v0.3.1.tar.gz
+sha256	f70de1e6b7e3750abb4ceacf0059e47b47c769f113434de10293b33867ce54c2	tinycbor-v0.3.2.tar.gz
diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk
index 0be91b7..1519680 100644
--- a/package/tinycbor/tinycbor.mk
+++ b/package/tinycbor/tinycbor.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-TINYCBOR_VERSION = v0.3.1
+TINYCBOR_VERSION = v0.3.2
 TINYCBOR_SITE = $(call github,01org,tinycbor,$(TINYCBOR_VERSION))
 TINYCBOR_LICENSE = MIT
 TINYCBOR_LICENSE_FILES = LICENSE
-- 
2.5.0

[Buildroot] [PATCH 2/2] tinycbor: fix issue on unnamed union

[Fabrice Fontaine]

Until tinycbor 0.4 is released, patch from dev branch is needed to
remove the usage of unnamed union which are not supported by all
targets such as blackfin

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
---
 package/tinycbor/tinycbor.hash | 1 +
 package/tinycbor/tinycbor.mk   | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/package/tinycbor/tinycbor.hash b/package/tinycbor/tinycbor.hash
index 258e0e6..8757047 100644
--- a/package/tinycbor/tinycbor.hash
+++ b/package/tinycbor/tinycbor.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256	f70de1e6b7e3750abb4ceacf0059e47b47c769f113434de10293b33867ce54c2	tinycbor-v0.3.2.tar.gz
+sha256	7d3aa839ae246e9e14fc73e67869d88c684802c1578fb75503f3fdde1482dcf6	ede7f1431ae06c9086f2a83a57bd7832d99280e3.patch
diff --git a/package/tinycbor/tinycbor.mk b/package/tinycbor/tinycbor.mk
index 1519680..6af2eef 100644
--- a/package/tinycbor/tinycbor.mk
+++ b/package/tinycbor/tinycbor.mk
@@ -9,6 +9,12 @@ TINYCBOR_SITE = $(call github,01org,tinycbor,$(TINYCBOR_VERSION))
 TINYCBOR_LICENSE = MIT
 TINYCBOR_LICENSE_FILES = LICENSE
 
+# This patch fixes the issue on unnamed union which are not supported by some
+# targets like blackfin
+# This patch is currently in dev branch and will be a part of v0.4
+TINYCBOR_PATCH = \
+	https://github.com/01org/tinycbor/commit/ede7f1431ae06c9086f2a83a57bd7832d99280e3.patch
+
 TINYCBOR_DEPENDENCIES = host-pkgconf
 TINYCBOR_INSTALL_STAGING = YES
 
-- 
2.5.0

[Buildroot] [PATCH 2/2] tinycbor: fix issue on unnamed union

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Until tinycbor 0.4 is released, patch from dev branch is needed to
 > remove the usage of unnamed union which are not supported by all
 > targets such as blackfin

What autobuilder issues does this fix?

I tried building this config after applying both patches:

http://autobuild.buildroot.net/results/f4d/f4d15afb44f471878dbdee7c67cd836bd2b79904/

But it now fails with:

src/open_memstream.c: In function ?open_memstream?:
src/open_memstream.c:105: error: expected ?=?, ?,?, ?;?, ?asm? or ?__attribute__? before ?vtable?
src/open_memstream.c:105: error: ?vtable? undeclared (first use in this function)
src/open_memstream.c:105: error: (Each undeclared identifier is reported only once
src/open_memstream.c:105: error: for each function it appears in.)
src/open_memstream.c:105: error: expected expression before ?{? token
src/open_memstream.c:111: warning: implicit declaration of function ?fopencookie?
src/open_memstream.c:111: warning: return makes pointer from integer without a cast
Makefile:198: recipe for target 'src/open_memstream.o' failed

So it isn't much of an improvement. Does it fix any other autobuilder issues?

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] tinycbor: fix issue on unnamed union

[Fabrice Fontaine]

Dear Peter,

It seems that the link you provided is not correct as in this build, the old tinycbor 0.3.1 is being compiled. Could you provide me the correct link so I can reproduce the issue? I suspect you encountered a totally new issue with src/open_memstream.c which is being compiled only if open_memstream is found in the toolchain but this file is also using fopencookie which does not seem to be available in the toolchain. If I can reproduce the issue, I will make a new patch to check the presence of fopencookie an send it upstream.

Concerning your original question, tinycbor 0.3.2 includes directly the patch from Thomas, more details can be found her: https://github.com/01org/tinycbor/commit/31c7f81d45d115d2007b1c881cbbd3a19618465c.

The second patch removes the unnamed union, more details can be found here: https://patchwork.ozlabs.org/patch/652187/.

Best regards,

Fabrice

Le 16 ao?t 2016 ? 07:52, Peter Korsgaard <peter@korsgaard.com> a ?crit :

>>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
> 
>> Until tinycbor 0.4 is released, patch from dev branch is needed to
>> remove the usage of unnamed union which are not supported by all
>> targets such as blackfin
> 
> What autobuilder issues does this fix?
> 
> I tried building this config after applying both patches:
> 
> http://autobuild.buildroot.net/results/f4d/f4d15afb44f471878dbdee7c67cd836bd2b79904/
> 
> But it now fails with:
> 
> src/open_memstream.c: In function ?open_memstream?:
> src/open_memstream.c:105: error: expected ?=?, ?,?, ?;?, ?asm? or ?__attribute__? before ?vtable?
> src/open_memstream.c:105: error: ?vtable? undeclared (first use in this function)
> src/open_memstream.c:105: error: (Each undeclared identifier is reported only once
> src/open_memstream.c:105: error: for each function it appears in.)
> src/open_memstream.c:105: error: expected expression before ?{? token
> src/open_memstream.c:111: warning: implicit declaration of function ?fopencookie?
> src/open_memstream.c:111: warning: return makes pointer from integer without a cast
> Makefile:198: recipe for target 'src/open_memstream.o' failed
> 
> So it isn't much of an improvement. Does it fix any other autobuilder issues?
> 
> -- 
> Bye, Peter Korsgaard

[Buildroot] [PATCH 2/2] tinycbor: fix issue on unnamed union

[Peter Korsgaard]

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > Dear Peter,
 > It seems that the link you provided is not correct as in this build,
 > the old tinycbor 0.3.1 is being compiled.

Yes, naturally - There won't be any autobuilder results for 0.3.2 before
your patches get included in the buildroot repo.

I was expecting your patches to fix some of our existing (E.G. using
0.3.1) autobuilder issues, but that is apparently not the case?

 > Could you provide me the correct link so I can reproduce the issue? I
 > suspect you encountered a totally new issue with src/open_memstream.c
 > which is being compiled only if open_memstream is found in the
 > toolchain but this file is also using fopencookie which does not seem
 > to be available in the toolchain. If I can reproduce the issue, I
 > will make a new patch to check the presence of fopencookie an send it
 > upstream.

You should be able to reproduce the issue if you build the defconfig
from

http://autobuild.buildroot.net/results/f4d/f4d15afb44f471878dbdee7c67cd836bd2b79904/

After applying your 2 tinybcr patches.

 > Concerning your original question, tinycbor 0.3.2 includes directly
 > the patch from Thomas, more details can be found her:
 > https://github.com/01org/tinycbor/commit/31c7f81d45d115d2007b1c881cbbd3a19618465c.

Ok, so that means we can drop 
0001-Makefile-use-installation-logic-compatible-with-old-.patch, good.

> The second patch removes the unnamed union, more details can be found
> here: https://patchwork.ozlabs.org/patch/652187/.

Ok. It would be nice to mention that in the commit message.

-- 
Venlig hilsen,
Peter Korsgaard 

[Buildroot] [PATCH 2/2] tinycbor: fix issue on unnamed union

[Fabrice Fontaine]

Dear Peter,

After more investigation, it seems that the uclibc for the blackfin target
is configured without __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
(./output/host/opt/ext-toolchain/bfin-uclinux/bfin-uclinux/runtime/usr/include/bits/uClibc_config.h).
Without this option, fopencookie is not available in the toolchain and so
the implementation of open_memstream function within tinycbor fails so I
would suggest to disable tinycbor if BR2_bfin target is set.

If this solution is acceptable, I can provide a patch.

Best Regards,

Fabrice

2016-08-16 17:07 GMT+02:00 Peter Korsgaard <peter@korsgaard.com>:

> >>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:
>
>  > Dear Peter,
>  > It seems that the link you provided is not correct as in this build,
>  > the old tinycbor 0.3.1 is being compiled.
>
> Yes, naturally - There won't be any autobuilder results for 0.3.2 before
> your patches get included in the buildroot repo.
>
> I was expecting your patches to fix some of our existing (E.G. using
> 0.3.1) autobuilder issues, but that is apparently not the case?
>
>  > Could you provide me the correct link so I can reproduce the issue? I
>  > suspect you encountered a totally new issue with src/open_memstream.c
>  > which is being compiled only if open_memstream is found in the
>  > toolchain but this file is also using fopencookie which does not seem
>  > to be available in the toolchain. If I can reproduce the issue, I
>  > will make a new patch to check the presence of fopencookie an send it
>  > upstream.
>
> You should be able to reproduce the issue if you build the defconfig
> from
>
> http://autobuild.buildroot.net/results/f4d/f4d15afb44f471878dbdee7c67cd83
> 6bd2b79904/
>
> After applying your 2 tinybcr patches.
>
>  > Concerning your original question, tinycbor 0.3.2 includes directly
>  > the patch from Thomas, more details can be found her:
>  > https://github.com/01org/tinycbor/commit/31c7f81d45d115d2007b1c881cbbd3
> a19618465c.
>
> Ok, so that means we can drop
> 0001-Makefile-use-installation-logic-compatible-with-old-.patch, good.
>
> > The second patch removes the unnamed union, more details can be found
> > here: https://patchwork.ozlabs.org/patch/652187/.
>
> Ok. It would be nice to mention that in the commit message.
>
> --
> Venlig hilsen,
> Peter Korsgaard
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20160816/fd24aa97/attachment.html>

[Buildroot] [PATCH 2/2] tinycbor: fix issue on unnamed union

[Thomas Petazzoni]

Hello,

On Tue, 16 Aug 2016 22:57:58 +0200, Fabrice Fontaine wrote:
> Dear Peter,
> 
> After more investigation, it seems that the uclibc for the blackfin target
> is configured without __UCLIBC_HAS_GLIBC_CUSTOM_STREAMS__
> (./output/host/opt/ext-toolchain/bfin-uclinux/bfin-uclinux/runtime/usr/include/bits/uClibc_config.h).
> Without this option, fopencookie is not available in the toolchain and so
> the implementation of open_memstream function within tinycbor fails so I
> would suggest to disable tinycbor if BR2_bfin target is set.
> 
> If this solution is acceptable, I can provide a patch.

This solution as-is is not acceptable: we now have support for Blackfin
in the internal toolchain backend, in which case uClibc is built with
UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y.

Therefore, what you want to do is:

	# package uses fopencookie(), not available with this toolchain
	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX

Could you resend a new patch series that takes into account this
aspect, and the other comments made by Peter Korsgaard?

Thanks!

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