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

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

[Fabrice Fontaine]

tinycbor 0.3.2 includes the buildroot patch that fixes the installation
with old Makefile used by targets such as blackfin, more details can be
found here: https://patchwork.ozlabs.org/patch/652187

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
---
Changes v1 -> v2 (after review of Peter Korsgaard):
 - Update commit message

 ...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 v2 2/3] tinycbor: fix issue on unnamed union

[Fabrice Fontaine]

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

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, more details can be found here:
https://patchwork.ozlabs.org/patch/652187/

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
---
Changes v1 -> v2 (after review of Peter Korsgaard):
 - Update commit message

 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 v2 3/3] tinycbor: add a dependency

[Fabrice Fontaine]

As tinycbor uses fopencookie() which is not available with the external
blackfin uclinux (UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is unset), add a
dependency on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX

Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
---
 package/tinycbor/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/tinycbor/Config.in b/package/tinycbor/Config.in
index 41f0b5f..cf176e4 100644
--- a/package/tinycbor/Config.in
+++ b/package/tinycbor/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_TINYCBOR
 	bool "tinycbor"
+	# package uses fopencookie(), not available with this toolchain
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
 	help
 	  Concise Binary Object Representation (CBOR) Library
 
-- 
2.5.0

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

[Thomas Petazzoni]

Hello,

On Fri, 19 Aug 2016 14:19:34 +0200, Fabrice Fontaine wrote:
> tinycbor 0.3.2 includes the buildroot patch that fixes the installation
> with old Makefile used by targets such as blackfin, more details can be
> found here: https://patchwork.ozlabs.org/patch/652187
> 
> Signed-off-by: Fabrice Fontaine <fabrice.fontaine@orange.com>
> ---
> Changes v1 -> v2 (after review of Peter Korsgaard):
>  - Update commit message

Thanks, I've applied the three patches, with those additional tweaks in
the commit log of the last patch.

Thanks!

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