From: Khem Raj <raj.khem@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-oe][PATCH 03/12] msgpack-c: Upgrade to 3.1.1
Date: Tue, 5 Mar 2019 21:45:39 -0800 [thread overview]
Message-ID: <20190306054548.16430-3-raj.khem@gmail.com> (raw)
In-Reply-To: <20190306054548.16430-1-raj.khem@gmail.com>
Drop upstreamed patch
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../0001-Fix-Werror-class-memaccess.patch | 35 -------------------
...{msgpack-c_2.1.5.bb => msgpack-c_3.1.1.bb} | 4 +--
2 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100644 meta-oe/recipes-devtools/msgpack/msgpack-c/0001-Fix-Werror-class-memaccess.patch
rename meta-oe/recipes-devtools/msgpack/{msgpack-c_2.1.5.bb => msgpack-c_3.1.1.bb} (84%)
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 <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
similarity index 84%
rename from meta-oe/recipes-devtools/msgpack/msgpack-c_2.1.5.bb
rename to meta-oe/recipes-devtools/msgpack/msgpack-c_3.1.1.bb
index 690a7f444b..90fd44e607 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"
--
2.21.0
next prev parent reply other threads:[~2019-03-06 5:45 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-06 5:45 [meta-oe][PATCH 01/12] poco: Backport riscv support patch Khem Raj
2019-03-06 5:45 ` [meta-multimedia][PATCH 02/12] liboil: Fix build on risc-v Khem Raj
2019-03-06 5:45 ` Khem Raj [this message]
2019-03-06 5:45 ` [meta-python][PATCH 04/12] python-greenlet: Upgrade to 0.4.15 Khem Raj
2019-03-06 5:45 ` [meta-python][PATCH 05/12] python-grpcio: Upgrade to 1.19.0 Khem Raj
2019-03-06 5:45 ` [meta-networking][PATCH 06/12] inetutils: Fix build on RISC-V Khem Raj
2019-03-07 17:23 ` Adrian Bunk
2019-03-07 17:25 ` Khem Raj
2019-03-07 20:48 ` Tom Rini
2019-03-07 20:53 ` Khem Raj
2019-03-07 21:01 ` Tom Rini
2019-03-06 5:45 ` [meta-oe][PATCH 07/12] nmap: " Khem Raj
2019-03-06 5:45 ` [meta-webserver][PATCH 08/12] netdata: Link with libpthread Khem Raj
2019-03-06 5:45 ` [meta-multimedia][PATCH 09/12] webrtc-audio-processing: Add support for risc-v Khem Raj
2019-03-06 5:45 ` [meta-oe][PATCH 10/12] openocd: Fix build " Khem Raj
2019-03-06 5:45 ` [meta-oe][PATCH 11/12] rabbitmq-c: Upgrade to 0.9.0 Khem Raj
2019-03-06 5:45 ` [meta-oe][PATCH 12/12] libmxml: Upgrade to 3.0 release Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190306054548.16430-3-raj.khem@gmail.com \
--to=raj.khem@gmail.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.