aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2017-09-20 10:19:18 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2017-09-22 22:50:47 +0000
commitf7324b4ddd8cdadbf6da18502c30d3681cd9f5ff (patch)
treee957660c02e7f717751676bd8a3e90f3ec309f60
parent7addfd42f684cacf35182ae25f016e58b5585142 (diff)
downloadmeta-openembedded-contrib-f7324b4ddd8cdadbf6da18502c30d3681cd9f5ff.tar.gz
meta-openembedded-contrib-f7324b4ddd8cdadbf6da18502c30d3681cd9f5ff.tar.bz2
meta-openembedded-contrib-f7324b4ddd8cdadbf6da18502c30d3681cd9f5ff.zip
msgpack-c: update to version 2.1.5
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch39
-rw-r--r--meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb (renamed from meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb)3
2 files changed, 1 insertions, 41 deletions
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch
deleted file mode 100644
index a388297a86..0000000000
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 15d8bb6792c9639d85a9ffe2ac81431f1b986c21 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 22 Apr 2017 08:53:50 -0700
-Subject: [PATCH] Comment intentional fallthrough in case statements
-
-Fixes build with gcc7
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
-index b35c21a7..4c463a90 100644
---- a/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
-+++ b/include/msgpack/v1/adaptor/detail/cpp03_define_array.hpp
-@@ -105,6 +105,7 @@ struct define_array<A0, A1> {
- switch(size) {
- default:
- case 2: ptr[1].convert(a1);
-+ //fallthrough
- case 1: ptr[0].convert(a0);
- }
- }
-@@ -193,8 +194,11 @@ struct define_array<A0, A1, A2, A3> {
- switch(size) {
- default:
- case 4: ptr[3].convert(a3);
-+ //fallthrough
- case 3: ptr[2].convert(a2);
-+ //fallthrough
- case 2: ptr[1].convert(a1);
-+ //fallthrough
- case 1: ptr[0].convert(a0);
- }
- }
---
-2.12.2
-
diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
index 7655d94698..d9f6956690 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
@@ -9,10 +9,9 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \
PV .= "+git${SRCPV}"
-SRCREV = "20ef1f925b007f170ab1c257e4aa61fdd0927773"
+SRCREV = "7a98138f27f27290e680bf8fbf1f8d1b089bf138"
SRC_URI = "git://github.com/msgpack/msgpack-c \
- file://0001-Comment-intentional-fallthrough-in-case-statements.patch \
"
inherit cmake pkgconfig