From 76093a6540e04b1a370ef7133365ab39b0a50e8f Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 5 Mar 2019 19:06:26 -0800 Subject: msgpack-c: Upgrade to 3.1.1 Drop upstreamed patch Signed-off-by: Khem Raj --- .../0001-Fix-Werror-class-memaccess.patch | 35 ---------------------- .../recipes-devtools/msgpack/msgpack-c_2.1.5.bb | 19 ------------ .../recipes-devtools/msgpack/msgpack-c_3.1.1.bb | 19 ++++++++++++ 3 files changed, 19 insertions(+), 54 deletions(-) delete mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch delete mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb create mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch b/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch deleted file mode 100644 index b0d772d937..0000000000 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a05d92ae85024d0648f69f95307a1d3e8e51109c Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 1 Apr 2018 19:55:38 -0700 -Subject: [PATCH] Fix -Werror=class-memaccess - -Casting to void* make gcc happy since its upset about -object types and rightly so - -Fixes - -'void* memcpy(void*, const void*, size_t)' copying an object of non-trivial type 'struct msgpack::v2::object' from an array of 'const msgpack_object' {aka 'const struct msgpack_object'} [-Werror=class-memaccess] - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted [https://github.com/msgpack/msgpack-c/pull/659] - - include/msgpack/v1/object.hpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/msgpack/v1/object.hpp b/include/msgpack/v1/object.hpp -index 64da8c53..9721f705 100644 ---- a/include/msgpack/v1/object.hpp -+++ b/include/msgpack/v1/object.hpp -@@ -661,7 +661,7 @@ inline object::object(const msgpack_object& o) - inline void operator<< (msgpack::object& o, const msgpack_object& v) - { - // FIXME beter way? -- std::memcpy(&o, &v, sizeof(v)); -+ std::memcpy(static_cast(&o), &v, sizeof(v)); - } - - inline object::operator msgpack_object() const --- -2.16.3 - diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb deleted file mode 100644 index 690a7f444b..0000000000 --- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "MessagePack implementation for C and C++" -DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" -HOMEPAGE = "http://msgpack.org/index.html" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ - file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ - file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ - " - -PV .= "+git${SRCPV}" - -SRC_URI = "git://github.com/msgpack/msgpack-c \ - file://0001-Fix-Werror-class-memaccess.patch \ - " -SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig diff --git a/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb new file mode 100644 index 0000000000..90fd44e607 --- /dev/null +++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb @@ -0,0 +1,19 @@ +SUMMARY = "MessagePack implementation for C and C++" +DESCRIPTION = "MessagePack is an efficient binary serialization format. It's like JSON. but fast and small" +HOMEPAGE = "http://msgpack.org/index.html" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ + file://COPYING;md5=0639c4209b6f2abf1437c813b208f2d3 \ + file://LICENSE_1_0.txt;md5=e4224ccaecb14d942c71d31bef20d78c \ + " + +PV .= "+git${SRCPV}" + +SRC_URI = "git://github.com/msgpack/msgpack-c \ + " +# cpp-3.1.1 +SRCREV = "83a82e3eb512b18d4149cabb7eb43c7e8bc081af" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig -- cgit 1.2.3-korg