From ff470ffb6b5f085ef3fa9c662990950b0de782d6 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Tue, 22 Jul 2025 11:12:16 +0800 Subject: python3-grpcio: upgrade 1.72.1 -> 1.73.1 Signed-off-by: Liu Yiding Signed-off-by: Khem Raj --- ...python-enable-unbundled-cross-compilation.patch | 4 +- .../python/python3-grpcio/abseil-ppc-fixes.patch | 13 +++--- .../python/python3-grpcio_1.72.1.bb | 46 ---------------------- .../python/python3-grpcio_1.73.1.bb | 46 ++++++++++++++++++++++ 4 files changed, 53 insertions(+), 56 deletions(-) delete mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.72.1.bb create mode 100644 meta-python/recipes-devtools/python/python3-grpcio_1.73.1.bb (limited to 'meta-python/recipes-devtools/python') diff --git a/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch b/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch index b2b2713559..bfc471f3fe 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/0001-python-enable-unbundled-cross-compilation.patch @@ -1,4 +1,4 @@ -From ed9f268774838d279e23b4ae9fb95ca7650942b2 Mon Sep 17 00:00:00 2001 +From 55405c161ec71068229d13ef19d2f01ff59c2b77 Mon Sep 17 00:00:00 2001 From: Peter Marko Date: Wed, 5 Feb 2025 21:06:50 +0100 Subject: [PATCH] python: enable unbundled cross compilation @@ -13,7 +13,7 @@ Signed-off-by: Peter Marko 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py -index 4d13d87..f002ab2 100644 +index 39ca17e..bffa9fb 100644 --- a/setup.py +++ b/setup.py @@ -318,25 +318,25 @@ if BUILD_WITH_SYSTEM_OPENSSL: diff --git a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch index 69e06a7918..946e36f53f 100644 --- a/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch +++ b/meta-python/recipes-devtools/python/python3-grpcio/abseil-ppc-fixes.patch @@ -1,5 +1,5 @@ -From a2ec96a96ff7ba016e800212a942b9f29f255415 Mon Sep 17 00:00:00 2001 -From: Khem Raj +From 42b215f964b2c13db4adb0ee72f024607f74e6d1 Mon Sep 17 00:00:00 2001 +From: Khem Raj Date: Sat, 13 Mar 2021 10:26:25 -0800 Subject: [PATCH] An all-in-one patch that fixes several issues: @@ -22,7 +22,7 @@ Signed-off-by: Wang Mingyu 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc -index a0bf3a6..103b4f6 100644 +index 68f9273..5dbfaab 100644 --- a/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc +++ b/third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc @@ -20,7 +20,7 @@ @@ -85,10 +85,10 @@ index 3dd6ba1..9f0601c 100644 return reinterpret_cast(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) diff --git a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -index 3929b1b..23d5e50 100644 +index 88949fe..4e26a6b 100644 --- a/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h +++ b/third_party/abseil-cpp/absl/debugging/internal/stacktrace_config.h -@@ -60,7 +60,7 @@ +@@ -67,7 +67,7 @@ #elif defined(__i386__) || defined(__x86_64__) #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_x86-inl.inc" @@ -97,6 +97,3 @@ index 3929b1b..23d5e50 100644 #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) --- -2.43.0 - diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.72.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.72.1.bb deleted file mode 100644 index 79059a33cf..0000000000 --- a/meta-python/recipes-devtools/python/python3-grpcio_1.72.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "Google gRPC" -HOMEPAGE = "https://www.grpc.io/" -SECTION = "devel/python" -LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \ - file://third_party/utf8_range/utf8_validity.h;beginline=1;endline=5;md5=db08ddb5817e660489678e7c3653805a \ - file://third_party/xxhash/xxhash.h;beginline=1;endline=34;md5=d41d564db2353fc80a713956d85b1690 \ -" - -DEPENDS += "c-ares openssl python3-protobuf re2 zlib" - -SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ - file://abseil-ppc-fixes.patch \ - " -SRC_URI[sha256sum] = "87f62c94a40947cec1a0f91f95f5ba0aa8f799f23a1d42ae5be667b6b27b959c" - -RDEPENDS:${PN} = "python3-protobuf" - -inherit setuptools3 -inherit pypi - -CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" - -# unbundling abseil-cpp needs work on dynamic linker issue -#export GRPC_PYTHON_BUILD_SYSTEM_ABSL = "1" -export GRPC_PYTHON_BUILD_SYSTEM_CARES = "1" -export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" -export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1" -export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" - -do_compile:prepend() { - export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="${@oe.utils.parallel_make(d, False)}" -} - -GRPC_CFLAGS ?= "" -GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" -export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" - -CLEANBROKEN = "1" - -BBCLASSEXTEND = "native nativesdk" - -CCACHE_DISABLE = "1" - -CVE_PRODUCT += "grpc:grpc" diff --git a/meta-python/recipes-devtools/python/python3-grpcio_1.73.1.bb b/meta-python/recipes-devtools/python/python3-grpcio_1.73.1.bb new file mode 100644 index 0000000000..0edfab3101 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-grpcio_1.73.1.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Google gRPC" +HOMEPAGE = "https://www.grpc.io/" +SECTION = "devel/python" +LICENSE = "Apache-2.0 & BSD-3-Clause & MPL-2.0 & MIT & BSD-2-Clause" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=731e401b36f8077ae0c134b59be5c906 \ + file://third_party/utf8_range/utf8_validity.h;beginline=1;endline=5;md5=db08ddb5817e660489678e7c3653805a \ + file://third_party/xxhash/xxhash.h;beginline=1;endline=34;md5=d41d564db2353fc80a713956d85b1690 \ +" + +DEPENDS += "c-ares openssl python3-protobuf re2 zlib" + +SRC_URI += "file://0001-python-enable-unbundled-cross-compilation.patch \ + file://abseil-ppc-fixes.patch \ + " +SRC_URI[sha256sum] = "7fce2cd1c0c1116cf3850564ebfc3264fba75d3c74a7414373f1238ea365ef87" + +RDEPENDS:${PN} = "python3-protobuf" + +inherit setuptools3 +inherit pypi + +CFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE" + +# unbundling abseil-cpp needs work on dynamic linker issue +#export GRPC_PYTHON_BUILD_SYSTEM_ABSL = "1" +export GRPC_PYTHON_BUILD_SYSTEM_CARES = "1" +export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = "1" +export GRPC_PYTHON_BUILD_SYSTEM_RE2 = "1" +export GRPC_PYTHON_BUILD_SYSTEM_ZLIB = "1" + +do_compile:prepend() { + export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="${@oe.utils.parallel_make(d, False)}" +} + +GRPC_CFLAGS ?= "" +GRPC_CFLAGS:append:toolchain-clang = " -fvisibility=hidden -fno-wrapv -fno-exceptions" +export GRPC_PYTHON_CFLAGS = "${GRPC_CFLAGS}" + +CLEANBROKEN = "1" + +BBCLASSEXTEND = "native nativesdk" + +CCACHE_DISABLE = "1" + +CVE_PRODUCT += "grpc:grpc" -- cgit v1.2.3-54-g00ecf