mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
ce02a140a0
- Compiling with option `--cpp_implementation', add cpp implementation support which requires to build with protobuf. - Workaround native compile failure while host gcc <= 4.8 Setting environment KOKORO_BUILD_NUMBER, the build will explicitly compile with option `-std=c++11', it could workaround native compile failure while host gcc <= 4.8 ... /usr/include/c++/4.8/bits/c++0x_warning.h:32:2: error: #error This file requires compiler and library support for the ISO C++ 2011 standard. This support is currently experimental, and must be enabled with the -std=c++11 or -std=gnu++11 compiler options ... - Add Python 3.7 compatibility Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
99 lines
4.0 KiB
Diff
99 lines
4.0 KiB
Diff
From 539bc017a62f91bdf7c547b58948cb5a2f59d918 Mon Sep 17 00:00:00 2001
|
|
From: Ben Webb <ben@salilab.org>
|
|
Date: Thu, 12 Jul 2018 10:58:10 -0700
|
|
Subject: [PATCH] Add Python 3.7 compatibility (#4862)
|
|
|
|
Compilation of Python wrappers fails with Python 3.7 because
|
|
the Python folks changed their C API such that
|
|
PyUnicode_AsUTF8AndSize() now returns a const char* rather
|
|
than a char*. Add a patch to work around. Relates #4086.
|
|
|
|
Upstream-Status: Backport [https://github.com/protocolbuffers/protobuf.git]
|
|
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
|
|
|
---
|
|
google/protobuf/pyext/descriptor.cc | 2 +-
|
|
google/protobuf/pyext/descriptor_containers.cc | 2 +-
|
|
google/protobuf/pyext/descriptor_pool.cc | 2 +-
|
|
google/protobuf/pyext/extension_dict.cc | 2 +-
|
|
google/protobuf/pyext/message.cc | 4 ++--
|
|
5 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/google/protobuf/pyext/descriptor.cc b/google/protobuf/pyext/descriptor.cc
|
|
index 8af0cb1..19a1c38 100644
|
|
--- a/google/protobuf/pyext/descriptor.cc
|
|
+++ b/google/protobuf/pyext/descriptor.cc
|
|
@@ -56,7 +56,7 @@
|
|
#endif
|
|
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
|
(PyUnicode_Check(ob)? \
|
|
- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
|
+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
|
|
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
|
#endif
|
|
|
|
diff --git a/google/protobuf/pyext/descriptor_containers.cc b/google/protobuf/pyext/descriptor_containers.cc
|
|
index bc007f7..0153664 100644
|
|
--- a/google/protobuf/pyext/descriptor_containers.cc
|
|
+++ b/google/protobuf/pyext/descriptor_containers.cc
|
|
@@ -66,7 +66,7 @@
|
|
#endif
|
|
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
|
(PyUnicode_Check(ob)? \
|
|
- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
|
+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
|
|
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
|
#endif
|
|
|
|
diff --git a/google/protobuf/pyext/descriptor_pool.cc b/google/protobuf/pyext/descriptor_pool.cc
|
|
index 95882ae..962accc 100644
|
|
--- a/google/protobuf/pyext/descriptor_pool.cc
|
|
+++ b/google/protobuf/pyext/descriptor_pool.cc
|
|
@@ -48,7 +48,7 @@
|
|
#endif
|
|
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
|
(PyUnicode_Check(ob)? \
|
|
- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
|
+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
|
|
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
|
#endif
|
|
|
|
diff --git a/google/protobuf/pyext/extension_dict.cc b/google/protobuf/pyext/extension_dict.cc
|
|
index 018b5c2..174c547 100644
|
|
--- a/google/protobuf/pyext/extension_dict.cc
|
|
+++ b/google/protobuf/pyext/extension_dict.cc
|
|
@@ -53,7 +53,7 @@
|
|
#endif
|
|
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
|
(PyUnicode_Check(ob)? \
|
|
- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
|
+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
|
|
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
|
#endif
|
|
|
|
diff --git a/google/protobuf/pyext/message.cc b/google/protobuf/pyext/message.cc
|
|
index 5893533..31094b7 100644
|
|
--- a/google/protobuf/pyext/message.cc
|
|
+++ b/google/protobuf/pyext/message.cc
|
|
@@ -79,7 +79,7 @@
|
|
(PyUnicode_Check(ob)? PyUnicode_AsUTF8(ob): PyBytes_AsString(ob))
|
|
#define PyString_AsStringAndSize(ob, charpp, sizep) \
|
|
(PyUnicode_Check(ob)? \
|
|
- ((*(charpp) = PyUnicode_AsUTF8AndSize(ob, (sizep))) == NULL? -1: 0): \
|
|
+ ((*(charpp) = const_cast<char*>(PyUnicode_AsUTF8AndSize(ob, (sizep)))) == NULL? -1: 0): \
|
|
PyBytes_AsStringAndSize(ob, (charpp), (sizep)))
|
|
#endif
|
|
#endif
|
|
@@ -1529,7 +1529,7 @@ PyObject* HasField(CMessage* self, PyObject* arg) {
|
|
return NULL;
|
|
}
|
|
#else
|
|
- field_name = PyUnicode_AsUTF8AndSize(arg, &size);
|
|
+ field_name = const_cast<char*>(PyUnicode_AsUTF8AndSize(arg, &size));
|
|
if (!field_name) {
|
|
return NULL;
|
|
}
|
|
--
|
|
2.7.4
|
|
|