mirror of
https://github.com/pentoo/pentoo-overlay
synced 2025-12-06 08:25:01 +01:00
grpcio-tools: bump 1.67.0, fix https://github.com/pentoo/pentoo-overlay/issues/2179
This commit is contained in:
parent
9f10d9f9a6
commit
29930986a8
8 changed files with 17 additions and 262 deletions
|
|
@ -1,2 +1 @@
|
|||
DIST grpcio-tools-1.62.0.tar.gz 4613875 BLAKE2B 60c8d7c38f10a80ed5b420ecab312ea6f5ad384245194c4f6726783385d443c6354306bbef604230d3a81e9f2cc6885f76eb6a5beae4733279d6210c3fe6603d SHA512 c1691a705cea54056850e98caff37025e551b165b4042f6cab856319805e9507b9aaac5ceea35641f62ce619274faac735e4d2002d36e22b1ce22cf96269dc58
|
||||
DIST grpcio_tools-1.65.2.tar.gz 5028990 BLAKE2B 96e141c620c6c7819dd9889263b0fe08f4abc93bbad50863e0513f85c4a140539e8aaef923fe502098234f1426a348c4b5b211998c7fcd952d280239a760ff8a SHA512 2b08fadaac4efda63bec88e1575062a6e88d2a187ee23cbad58eeed41612660dc9a2abfd37cf9b8025a287bdb5c7a82fb59d652391d6f026ac31d1a7487f0282
|
||||
DIST grpcio_tools-1.67.0.tar.gz 5159163 BLAKE2B 54a7db77514033c4747d20a13fded114828fed23f649587c649f5ad2716d4bb31b80eeda560d55ae087a564cb9d34563a612cc91df581ae6b9a761f307828397 SHA512 f9644b4424aa68f1ae4d679c7b635db9bbfc0b493c76caf7d2e9fe0a49e5e81b6f146666c8dba3fc1d1c0db141f8fb362dd0ede0842c34cb178009412a672ec5
|
||||
|
|
|
|||
|
|
@ -1,37 +0,0 @@
|
|||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{11..13} )
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYPI_NO_NORMALIZE=1
|
||||
|
||||
inherit distutils-r1 multiprocessing prefix pypi
|
||||
|
||||
DESCRIPTION="Protobuf code generator for gRPC"
|
||||
HOMEPAGE="https://grpc.io"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
|
||||
<dev-python/protobuf-5[${PYTHON_USEDEP}]
|
||||
>=dev-python/protobuf-4.21.3[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
python_prepare_all() {
|
||||
distutils-r1_python_prepare_all
|
||||
hprefixify setup.py
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
export GRPC_PYTHON_BUILD_WITH_CYTHON=1
|
||||
export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@ HOMEPAGE="https://grpc.io"
|
|||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
KEYWORDS="amd64 ~arm ~arm64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
|
||||
|
|
@ -32,16 +32,24 @@ python_prepare_all() {
|
|||
distutils-r1_python_prepare_all
|
||||
hprefixify setup.py
|
||||
|
||||
#absl/base/config.h ABSL_LTS_RELEASE_VERSION
|
||||
# system: 20240722
|
||||
#google/protobuf/wrappers.pb.h
|
||||
# Protobuf C++ Version: 5.28.0
|
||||
# PROTOBUF_VERSION
|
||||
# protobuf/compiler/versions.h
|
||||
# #define PROTOBUF_CPP_VERSION_STRING
|
||||
|
||||
# use system protobuf
|
||||
sed -r -i \
|
||||
-e '/^CC_FILES=\[/,/\]/{/^CC_FILES=\[/n;/\]/!d;}' \
|
||||
-e '/^CC_INCLUDES=\[/,/\]/{/^CC_INCLUDES=\[/n;/\]/!d;}' \
|
||||
-e "s@^(PROTO_INCLUDE=')[^']+'@\1/usr/include'@" \
|
||||
-e '/^PROTOBUF_SUBMODULE_VERSION=/d' \
|
||||
protoc_lib_deps.py
|
||||
# sed -r -i \
|
||||
# -e '/^CC_FILES=\[/,/\]/{/^CC_FILES=\[/n;/\]/!d;}' \
|
||||
# -e '/^CC_INCLUDES=\[/,/\]/{/^CC_INCLUDES=\[/n;/\]/!d;}' \
|
||||
# -e "s@^(PROTO_INCLUDE=')[^']+'@\1/usr/include'@" \
|
||||
# -e '/^PROTOBUF_SUBMODULE_VERSION=/d' \
|
||||
# protoc_lib_deps.py
|
||||
|
||||
# fix the include path
|
||||
ln -s ../../../.. grpc_root
|
||||
# ln -s ../../../.. grpc_root
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
|
|
@ -1,2 +0,0 @@
|
|||
DIST grpcio-1.62.0.tar.gz 26315723 BLAKE2B a49156538644f66af7a569c0a91eb48a5d15177a8aa7c4410c4f8ea54f18893f2ca6d10a522a73f4e4d8950372aa35e8bc909f062b89db0a40e8765cebd43a23 SHA512 cd54cf3c2d296faca2f7b4eb13385e407aa09be752234585cb71b53afd1bc48fd8aca01eac1a4e2583a0ef07a902b84c887413d6678210c5f38a91a13960e826
|
||||
DIST grpcio-1.65.2.tar.gz 12259424 BLAKE2B e689199b605f742fdf89f18d0c8844f4b66c65960b4bd959f3ac6b000389fc196e9a1a6acd9d3a1a7323a93e45082d09bf6aae210dbcf445040ff177f0f26581 SHA512 c4c90b9bfc910cf2a81d52699da11c2312bc198e41f8babd2aaa3479b990dd031522f55abd3c7363ca64a383d9589724f503182b807371f25f7c2ce9823d3b6d
|
||||
|
|
@ -1,107 +0,0 @@
|
|||
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2024-03-05 18:46:12.903254598 +0800
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi 2024-03-05 18:46:42.989252881 +0800
|
||||
@@ -48,7 +48,7 @@
|
||||
@staticmethod
|
||||
cdef void functor_run(
|
||||
grpc_completion_queue_functor* functor,
|
||||
- int succeed)
|
||||
+ int succeed) noexcept
|
||||
|
||||
cdef grpc_completion_queue_functor *c_functor(self)
|
||||
|
||||
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2024-03-05 18:46:12.903254598 +0800
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi 2024-03-05 18:47:00.094251906 +0800
|
||||
@@ -50,7 +50,7 @@
|
||||
@staticmethod
|
||||
cdef void functor_run(
|
||||
grpc_completion_queue_functor* functor,
|
||||
- int success):
|
||||
+ int success) noexcept:
|
||||
cdef CallbackContext *context = <CallbackContext *>functor
|
||||
cdef object waiter = <object>context.waiter
|
||||
if not waiter.cancelled():
|
||||
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2024-03-05 18:46:12.903254598 +0800
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi 2024-03-05 18:48:02.097248368 +0800
|
||||
@@ -316,7 +316,7 @@
|
||||
return credentials
|
||||
|
||||
cdef grpc_ssl_certificate_config_reload_status _server_cert_config_fetcher_wrapper(
|
||||
- void* user_data, grpc_ssl_server_certificate_config **config) with gil:
|
||||
+ void* user_data, grpc_ssl_server_certificate_config **config) noexcept with gil:
|
||||
# This is a credentials.ServerCertificateConfig
|
||||
cdef ServerCertificateConfig cert_config = None
|
||||
if not user_data:
|
||||
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi 2024-03-05 18:46:12.902254598 +0800
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi 2024-03-05 19:16:29.155150966 +0800
|
||||
@@ -12,10 +12,10 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
-cdef void __prefork() nogil
|
||||
+cdef void __prefork() noexcept nogil
|
||||
|
||||
|
||||
-cdef void __postfork_parent() nogil
|
||||
+cdef void __postfork_parent() noexcept nogil
|
||||
|
||||
|
||||
-cdef void __postfork_child() nogil
|
||||
\ No newline at end of file
|
||||
+cdef void __postfork_child() noexcept nogil
|
||||
\ No newline at end of file
|
||||
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi 2024-03-05 18:46:12.903254598 +0800
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi 2024-03-05 19:17:17.124148229 +0800
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
_fork_handler_failed = False
|
||||
|
||||
-cdef void __prefork() nogil:
|
||||
+cdef void __prefork() noexcept nogil:
|
||||
with gil:
|
||||
global _fork_handler_failed
|
||||
_fork_handler_failed = False
|
||||
@@ -49,14 +49,14 @@
|
||||
_fork_handler_failed = True
|
||||
|
||||
|
||||
-cdef void __postfork_parent() nogil:
|
||||
+cdef void __postfork_parent() noexcept nogil:
|
||||
with gil:
|
||||
with _fork_state.fork_in_progress_condition:
|
||||
_fork_state.fork_in_progress = False
|
||||
_fork_state.fork_in_progress_condition.notify_all()
|
||||
|
||||
|
||||
-cdef void __postfork_child() nogil:
|
||||
+cdef void __postfork_child() noexcept nogil:
|
||||
with gil:
|
||||
try:
|
||||
if _fork_handler_failed:
|
||||
diff -Naur a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2024-03-05 18:46:12.903254598 +0800
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi 2024-03-05 19:17:53.735146140 +0800
|
||||
@@ -13,16 +13,16 @@
|
||||
# limitations under the License.
|
||||
|
||||
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
|
||||
-cdef void* _copy_pointer(void* pointer):
|
||||
+cdef void* _copy_pointer(void* pointer) noexcept:
|
||||
return pointer
|
||||
|
||||
|
||||
# TODO(https://github.com/grpc/grpc/issues/15662): Reform this.
|
||||
-cdef void _destroy_pointer(void* pointer):
|
||||
+cdef void _destroy_pointer(void* pointer) noexcept:
|
||||
pass
|
||||
|
||||
|
||||
-cdef int _compare_pointer(void* first_pointer, void* second_pointer):
|
||||
+cdef int _compare_pointer(void* first_pointer, void* second_pointer) noexcept:
|
||||
if first_pointer < second_pointer:
|
||||
return -1
|
||||
elif first_pointer > second_pointer:
|
||||
|
|
@ -1,50 +0,0 @@
|
|||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
|
||||
inherit distutils-r1 multiprocessing prefix pypi
|
||||
|
||||
DESCRIPTION="High-performance RPC framework (python libraries)"
|
||||
HOMEPAGE="https://grpc.io"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
|
||||
>=dev-libs/re2-0.2021.11.01:=
|
||||
<dev-python/protobuf-5[${PYTHON_USEDEP}]
|
||||
>=dev-python/protobuf-4.21.3[${PYTHON_USEDEP}]
|
||||
net-dns/c-ares:=
|
||||
sys-libs/zlib:=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
|
||||
|
||||
PATCHES=(
|
||||
# "${FILESDIR}/1.51.0-respect-cc.patch"
|
||||
"${FILESDIR}/1.62.0-cython3.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
distutils-r1_python_prepare_all
|
||||
hprefixify setup.py
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
# os.environ.get('GRPC_BUILD_WITH_BORING_SSL_ASM', True)
|
||||
export GRPC_BUILD_WITH_BORING_SSL_ASM=
|
||||
export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
|
||||
export GRPC_PYTHON_BUILD_WITH_SYSTEM_RE2=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
|
||||
export GRPC_PYTHON_BUILD_WITH_CYTHON=1
|
||||
export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
|
||||
}
|
||||
|
|
@ -1,47 +0,0 @@
|
|||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
DISTUTILS_EXT=1
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
|
||||
inherit distutils-r1 multiprocessing prefix pypi
|
||||
|
||||
DESCRIPTION="High-performance RPC framework (python libraries)"
|
||||
HOMEPAGE="https://grpc.io"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
|
||||
>=dev-python/protobuf-5.26.1[${PYTHON_USEDEP}]
|
||||
>=dev-libs/re2-0.2024.07.02:=
|
||||
net-dns/c-ares:=
|
||||
sys-libs/zlib:=
|
||||
"
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
dev-python/cython[${PYTHON_USEDEP}]
|
||||
"
|
||||
|
||||
python_prepare_all() {
|
||||
distutils-r1_python_prepare_all
|
||||
hprefixify setup.py
|
||||
}
|
||||
|
||||
python_configure_all() {
|
||||
export GRPC_BUILD_WITH_BORING_SSL_ASM=0
|
||||
export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_RE2=0
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_ABSL=1
|
||||
export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
|
||||
export GRPC_PYTHON_BUILD_WITH_CYTHON=1
|
||||
export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
|
||||
}
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<!-- maintainer-needed -->
|
||||
<upstream>
|
||||
<remote-id type="github">grpc/grpc</remote-id>
|
||||
<remote-id type="pypi">grpcio</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in a new issue