From f7324b4ddd8cdadbf6da18502c30d3681cd9f5ff Mon Sep 17 00:00:00 2001 From: Derek Straka Date: Wed, 20 Sep 2017 10:19:18 -0400 Subject: [PATCH] msgpack-c: update to version 2.1.5 Signed-off-by: Derek Straka Signed-off-by: Martin Jansa --- ...ional-fallthrough-in-case-statements.patch | 39 ------------------- ...{msgpack-c_2.1.1.bb => msgpack-c_2.1.5.bb} | 3 +- 2 files changed, 1 insertion(+), 41 deletions(-) delete mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Comment-intentional-fallthrough-in-case-statements.patch rename meta-oe/recipes-devtools/msgpack/{msgpack-c_2.1.1.bb => msgpack-c_2.1.5.bb} (83%) 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 -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 ---- - 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 { - switch(size) { - default: - case 2: ptr[1].convert(a1); -+ //fallthrough - case 1: ptr[0].convert(a0); - } - } -@@ -193,8 +194,11 @@ struct define_array { - 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 similarity index 83% rename from meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.1.bb rename to 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