From bb27cf1c1e92bfa6aeff7e339ff09db37a4b1bd6 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 20 Sep 2022 10:22:05 +0800 Subject: [PATCH] python3-grpcio-tools: upgrade 1.48.1 -> 1.49.0 0001-protobuf-Disable-musttail-attribute-on-mips.patch refreshed for new version. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...f-Disable-musttail-attribute-on-mips.patch | 20 +++++++------------ ...48.1.bb => python3-grpcio-tools_1.49.0.bb} | 2 +- 2 files changed, 8 insertions(+), 14 deletions(-) rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.48.1.bb => python3-grpcio-tools_1.49.0.bb} (85%) diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch index d19d1eee4c..8b13d7ae21 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-protobuf-Disable-musttail-attribute-on-mips.patch @@ -7,24 +7,18 @@ See https://github.com/llvm/llvm-project/issues/57795 Upstream-Status: Pending Signed-off-by: Khem Raj +Signed-off-by: Wang Mingyu --- third_party/protobuf/src/google/protobuf/port_def.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc -index 37632cf..3c3c1e4 100644 --- a/third_party/protobuf/src/google/protobuf/port_def.inc +++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -230,7 +230,8 @@ +@@ -255,6 +255,7 @@ #error PROTOBUF_TAILCALL was previously defined #endif - #if __has_cpp_attribute(clang::musttail) && \ -- !defined(__arm__) && !defined(_ARCH_PPC) && !defined(__wasm__) -+ !defined(__arm__) && !defined(_ARCH_PPC) && !defined(__wasm__) && \ -+ !defined(__mips__) - # ifndef PROTO2_OPENSOURCE - // Compilation fails on ARM32: b/195943306 - // Compilation fails on powerpc64le: b/187985113 --- -2.37.3 - + #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ ++ !defined(__mips__) && \ + !defined(_ARCH_PPC) && !defined(__wasm__) && \ + !(defined(_MSC_VER) && defined(_M_IX86)) && \ + !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.1.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.49.0.bb similarity index 85% rename from meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.1.bb rename to meta-python/recipes-devtools/python/python3-grpcio-tools_1.49.0.bb index 002211a8c1..d2b599ae7a 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.48.1.bb +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.49.0.bb @@ -12,7 +12,7 @@ DEPENDS += "${PYTHON_PN}-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] = "1178f2ea531f80cc2027ec64728df6ffc8e98cf1df61652a496eafd612127183" +SRC_URI[sha256sum] = "16ac93ac515194f63febcf6f8a96a7f17390268972acc15e765d257f5008f2af" RDEPENDS:${PN} = "${PYTHON_PN}-grpcio"