| Message ID | 1663640525-27494-1-git-send-email-wangmy@fujitsu.com |
|---|---|
| State | New |
| Headers | show |
| Series | [meta-python] python3-grpcio-tools: upgrade 1.48.1 -> 1.49.0 | expand |
On Mon, Sep 19, 2022 at 10:22 PM wangmy <wangmy@fujitsu.com> wrote: > > 0001-protobuf-Disable-musttail-attribute-on-mips.patch > refreshed for new version. > > Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> > --- > ...f-Disable-musttail-attribute-on-mips.patch | 19 ++++++++++--------- > ...48.1.bb => python3-grpcio-tools_1.49.0.bb} | 2 +- > 2 files changed, 11 insertions(+), 10 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..5e8184b636 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,25 @@ See https://github.com/llvm/llvm-project/issues/57795 > > 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(-) > > 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 > +index e4b0753..4f603e6 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 @@ > - #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__) > +@@ -257,7 +257,8 @@ > + #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ > + !defined(_ARCH_PPC) && !defined(__wasm__) && \ > + !(defined(_MSC_VER) && defined(_M_IX86)) && \ > +- !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) > ++ !(defined(__NDK_MAJOR__) && !defined(__mips__) && \ this rebase has gone wrong here. I have fixed it this time, but it would be nice if you could test relevant builds e.g. mips build here with clang compiler to ensure that rebase has been done right. > ++ __NDK_MAJOR <= 24) > # ifndef PROTO2_OPENSOURCE > // Compilation fails on ARM32: b/195943306 > // Compilation fails on powerpc64le: b/187985113 > -- > -2.37.3 > +2.25.1 > > 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" > > -- > 2.25.1 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#98883): https://lists.openembedded.org/g/openembedded-devel/message/98883 > Mute This Topic: https://lists.openembedded.org/mt/93796046/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
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..5e8184b636 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,25 @@ See https://github.com/llvm/llvm-project/issues/57795 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(-) 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 +index e4b0753..4f603e6 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 @@ - #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__) +@@ -257,7 +257,8 @@ + #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ + !defined(_ARCH_PPC) && !defined(__wasm__) && \ + !(defined(_MSC_VER) && defined(_M_IX86)) && \ +- !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) ++ !(defined(__NDK_MAJOR__) && !defined(__mips__) && \ ++ __NDK_MAJOR <= 24) # ifndef PROTO2_OPENSOURCE // Compilation fails on ARM32: b/195943306 // Compilation fails on powerpc64le: b/187985113 -- -2.37.3 +2.25.1 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"
0001-protobuf-Disable-musttail-attribute-on-mips.patch refreshed for new version. Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> --- ...f-Disable-musttail-attribute-on-mips.patch | 19 ++++++++++--------- ...48.1.bb => python3-grpcio-tools_1.49.0.bb} | 2 +- 2 files changed, 11 insertions(+), 10 deletions(-) rename meta-python/recipes-devtools/python/{python3-grpcio-tools_1.48.1.bb => python3-grpcio-tools_1.49.0.bb} (85%)