@@ -1,4 +1,4 @@
-From ded393c799d4d970d69a75c458f3672b03099aeb Mon Sep 17 00:00:00 2001
+From 668d3e577073e51cc7e98b42d89c1e2b9b4e04b4 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
@@ -13,10 +13,10 @@ Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
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 56f995e..4d36c2f 100644
+index edd6d51..6ddaf80 100644
--- a/third_party/protobuf/src/google/protobuf/port_def.inc
+++ b/third_party/protobuf/src/google/protobuf/port_def.inc
-@@ -227,6 +227,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
+@@ -235,6 +235,7 @@ static_assert(PROTOBUF_ABSL_MIN(20230125, 3),
#error PROTOBUF_TAILCALL was previously defined
#endif
#if ABSL_HAVE_CPP_ATTRIBUTE(clang::musttail) && !defined(__arm__) && \
@@ -1,4 +1,4 @@
-From f1bf68aaa5417bcb7ad4996f1be8d2c0f53c521c Mon Sep 17 00:00:00 2001
+From 1f1f174ed3ca28bdf8bbb479eb1d948d934dcc53 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
@@ -27,7 +27,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/setup.py b/setup.py
-index 1a997df..86e3ad1 100644
+index ff27e67..964baf4 100644
--- a/setup.py
+++ b/setup.py
@@ -90,9 +90,11 @@ def check_linker_need_libatomic():
@@ -54,6 +54,3 @@ index 1a997df..86e3ad1 100644
stdin=PIPE,
stdout=PIPE,
stderr=PIPE,
-2.43.0
-
similarity index 89%
rename from meta-python/recipes-devtools/python/python3-grpcio-tools_1.72.1.bb
rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.73.1.bb
@@ -15,7 +15,7 @@ DEPENDS += "python3-grpcio"
SRC_URI += "file://0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch \
file://0001-protobuf-Disable-musttail-attribute-on-mips.patch \
"
-SRC_URI[sha256sum] = "a11afb21d0e960eb41f3c3053206e9271ec42579582c13193b99a0dca6be86d1"
+SRC_URI[sha256sum] = "6e06adec3b0870f5947953b0ef8dbdf2cebcdff61fb1fe08120cc7483c7978aa"
RDEPENDS:${PN} = "python3-grpcio"
Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com> --- .../0001-protobuf-Disable-musttail-attribute-on-mips.patch | 6 +++--- ...0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch | 7 ++----- ...pcio-tools_1.72.1.bb => python3-grpcio-tools_1.73.1.bb} | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.72.1.bb => python3-grpcio-tools_1.73.1.bb} (89%)