diff options
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools')
2 files changed, 12 insertions, 13 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch index 67505d0ce1..bf13c71cdd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch @@ -1,4 +1,4 @@ -From 64d737318656286f69ddc5ad654072785ddcbbed Mon Sep 17 00:00:00 2001 +From 028a02fa7f03a3bcd590624d32b09100129e096a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 16 Sep 2022 19:09:15 -0700 Subject: [PATCH] protobuf: Disable musttail attribute on mips @@ -9,12 +9,14 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- - third_party/protobuf/src/google/protobuf/port_def.inc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + third_party/protobuf/src/google/protobuf/port_def.inc | 1 + + 1 file changed, 1 insertion(+) +diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc +index 2b13718..8875e3e 100644 --- a/third_party/protobuf/src/google/protobuf/port_def.inc +++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -298,6 +298,7 @@ +@@ -242,6 +242,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3), #error PROTOBUF_TAILCALL was previously defined #endif #if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 07276c17f6..5366a1e1cf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -1,4 +1,4 @@ -From 9b2f1d400db8b8d0045f5a58a748a2dc52b5c9ef Mon Sep 17 00:00:00 2001 +From f1bf68aaa5417bcb7ad4996f1be8d2c0f53c521c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 17 Feb 2021 13:38:55 -0800 Subject: [PATCH] setup.py: Do not mix C and C++ compiler options @@ -23,14 +23,14 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - setup.py | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + setup.py | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index cc53e79..be3bc78 100644 +index 5e19b63..61b30d8 100644 --- a/setup.py +++ b/setup.py -@@ -88,9 +88,11 @@ +@@ -90,9 +90,11 @@ def check_linker_need_libatomic(): b"#include <atomic>\n" + b"int main() { return std::atomic<int64_t>{}; }" ) @@ -45,7 +45,7 @@ index cc53e79..be3bc78 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE, -@@ -101,7 +103,7 @@ +@@ -103,7 +105,7 @@ def check_linker_need_libatomic(): # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 cpp_test = subprocess.Popen( @@ -54,6 +54,3 @@ index cc53e79..be3bc78 100644 stdin=PIPE, stdout=PIPE, stderr=PIPE, --- -2.25.1 - |