aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-03-05 19:06:26 -0800
committerKhem Raj <raj.khem@gmail.com>2019-03-06 11:32:27 -0800
commit76093a6540e04b1a370ef7133365ab39b0a50e8f (patch)
tree0bc94fb4bbdc96b5ccbddaef2c1933d52bc41bd4 /meta-oe
parentd3d751e8594564451d926902518f54d488777f9c (diff)
downloadmeta-openembedded-76093a6540e04b1a370ef7133365ab39b0a50e8f.tar.gz
meta-openembedded-76093a6540e04b1a370ef7133365ab39b0a50e8f.tar.bz2
meta-openembedded-76093a6540e04b1a370ef7133365ab39b0a50e8f.zip
msgpack-c: Upgrade to 3.1.1
Drop upstreamed patch Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch35
-rw-r--r--meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb (renamed from meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb)4
2 files changed, 2 insertions, 37 deletions
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 b0d772d93..000000000
--- 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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
----
-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<void*>(&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_3.1.1.bb
index 690a7f444..90fd44e60 100644
--- a/meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
+++ b/meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb
@@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \
PV .= "+git${SRCPV}"
SRC_URI = "git://github.com/msgpack/msgpack-c \
- file://0001-Fix-Werror-class-memaccess.patch \
"
-SRCREV = "208595b2620cf6260ce3d6d4cf8543f13b206449"
+# cpp-3.1.1
+SRCREV = "83a82e3eb512b18d4149cabb7eb43c7e8bc081af"
S = "${WORKDIR}/git"