From f945cda4e7eee17aa921d85d9c68c2eee728f1ee Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Mon, 10 Feb 2025 17:01:09 +0800 Subject: python3-grpcio-tools: upgrade 1.69.0 -> 1.70.0 0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch refreshed for 1.70.0 Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...up.py-Do-not-mix-C-and-C-compiler-options.patch | 13 ++++++++----- .../python/python3-grpcio-tools_1.69.0.bb | 22 ---------------------- .../python/python3-grpcio-tools_1.70.0.bb | 22 ++++++++++++++++++++++ 3 files changed, 30 insertions(+), 27 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch index 5366a1e1cf..439b337bda 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools/0001-setup.py-Do-not-mix-C-and-C-compiler-options.patch @@ -27,7 +27,7 @@ Signed-off-by: Khem Raj 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py -index 5e19b63..61b30d8 100644 +index 1a997df..86e3ad1 100644 --- a/setup.py +++ b/setup.py @@ -90,9 +90,11 @@ def check_linker_need_libatomic(): @@ -36,12 +36,12 @@ index 5e19b63..61b30d8 100644 ) - cxx = os.environ.get("CXX", "c++") - cpp_test = subprocess.Popen( -- [cxx, "-x", "c++", "-std=c++14", "-"], +- [cxx, "-x", "c++", "-std=c++17", "-"], + cxx, cxx_args = os.environ.get('CXX').split(' ', 1) or 'c++' + if not cxx_args: + cxx_args = "-g" + -+ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++14', '-'], ++ cpp_test = subprocess.Popen([cxx, cxx_args, '-x', 'c++', '-std=c++17', '-'], stdin=PIPE, stdout=PIPE, stderr=PIPE, @@ -49,8 +49,11 @@ index 5e19b63..61b30d8 100644 # Double-check to see if -latomic actually can solve the problem. # https://github.com/grpc/grpc/issues/22491 cpp_test = subprocess.Popen( -- [cxx, "-x", "c++", "-std=c++14", "-", "-latomic"], -+ [cxx, cxx_args, '-x', 'c++', '-std=c++14', '-', '-latomic'], +- [cxx, "-x", "c++", "-std=c++17", "-", "-latomic"], ++ [cxx, cxx_args, '-x', 'c++', '-std=c++17', '-', '-latomic'], stdin=PIPE, stdout=PIPE, stderr=PIPE, +-- +2.43.0 + diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb deleted file mode 100644 index 76f5739f95..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.69.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Google gRPC tools" -HOMEPAGE = "http://www.grpc.io/" -SECTION = "devel/python" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" - -inherit pypi setuptools3 - -PYPI_PACKAGE = "grpcio_tools" -UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" - -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] = "3e1a98f4d9decb84979e1ddd3deb09c0a33a84b6e3c0776d5bde4097e3ab66dd" - -RDEPENDS:${PN} = "python3-grpcio" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb new file mode 100644 index 0000000000..e295e0329e --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio-tools_1.70.0.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Google gRPC tools" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "grpcio_tools" +UPSTREAM_CHECK_PYPI_PACKAGE = "${PYPI_PACKAGE}" + +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] = "e578fee7c1c213c8e471750d92631d00f178a15479fb2cb3b939a07fc125ccd3" + +RDEPENDS:${PN} = "python3-grpcio" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf