mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-04-21 14:21:02 +02:00
grpcio: removed in gentoo's favour, https://github.com/googleapis/storage-testbench/issues/543
This commit is contained in:
Anton Bolshakov
parent
545b2f40b2
commit
67294ad9b5
7 changed files with 2 additions and 243 deletions
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python3_{10..12} )
|
||||
PYTHON_COMPAT=( python3_{10..11} )
|
||||
inherit distutils-r1 linux-info systemd xdg-utils
|
||||
|
||||
DESCRIPTION="Desktop application firewall"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
EAPI=8
|
||||
|
||||
PYTHON_COMPAT=( python3_{9..12} )
|
||||
PYTHON_COMPAT=( python3_{9..11} )
|
||||
DISTUTILS_USE_PEP517=setuptools
|
||||
PYPI_NO_NORMALIZE=1
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
DIST grpcio-1.57.0.tar.gz 24737546 BLAKE2B 61cca75c6c39b90caebee51d587828c5ef831dabeaf914e68dc1d52667aafd41104bca3d7a9815fff76c05a097f1b9869d094de4a061307f005723714700ae16 SHA512 d4564d52f5155385391e4a8529ea8aa570c670aafb7211267891000406345d4a5576424e70e0694d270d936e00221a527fb58481e9b3af07817a6302c1043c9d
|
||||
|
|
@ -1,150 +0,0 @@
|
|||
https://bugs.gentoo.org/911370
|
||||
https://github.com/grpc/grpc/issues/33918#issuecomment-1703386656
|
||||
https://github.com/grpc/grpc/issues/33918#issuecomment-1788823585
|
||||
https://github.com/grpc/grpc/pull/34242
|
||||
https://src.fedoraproject.org/rpms/grpc/blob/8bf11b8c20d2c54dcf7b88777d7590237b6b0555/f/0001-Specify-noexcept-for-cdef-functions.patch
|
||||
|
||||
From 45d31dba83999638808891ee7bf93638106bdb71 Mon Sep 17 00:00:00 2001
|
||||
From: Atri Bhattacharya <badshah400@gmail.com>
|
||||
Date: Thu, 7 Sep 2023 07:06:56 +0200
|
||||
Subject: [PATCH] Specify noexcept for cdef functions.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
To build against cython 3.0, cdef functions that do not raise exceptions
|
||||
need to be explicitly declared as noexcept. Fixes issue #33918.
|
||||
|
||||
Co-Authored-By: Miro HronĨok <miro@hroncok.cz>
|
||||
---
|
||||
.../grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi | 2 +-
|
||||
.../grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi | 2 +-
|
||||
.../grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi | 2 +-
|
||||
.../grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi | 12 ++++++------
|
||||
.../grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi | 6 +++---
|
||||
.../grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi | 6 +++---
|
||||
6 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
|
||||
index e54e510..26edbdb 100644
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pxd.pxi
|
||||
@@ -48,7 +48,7 @@ cdef class CallbackWrapper:
|
||||
@staticmethod
|
||||
cdef void functor_run(
|
||||
grpc_completion_queue_functor* functor,
|
||||
- int succeed)
|
||||
+ int succeed) noexcept
|
||||
|
||||
cdef grpc_completion_queue_functor *c_functor(self)
|
||||
|
||||
diff --git a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
|
||||
index f2d94a9..5dda90a 100644
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/aio/callback_common.pyx.pxi
|
||||
@@ -50,7 +50,7 @@ cdef class CallbackWrapper:
|
||||
@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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
|
||||
index 23de3a0..52071f5 100644
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/credentials.pyx.pxi
|
||||
@@ -314,7 +314,7 @@ def server_credentials_ssl_dynamic_cert_config(initial_cert_config,
|
||||
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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi
|
||||
index a925bdd..5e97a6d 100644
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pxd.pxi
|
||||
@@ -15,15 +15,15 @@
|
||||
|
||||
cdef extern from "pthread.h" nogil:
|
||||
int pthread_atfork(
|
||||
- void (*prepare)() nogil,
|
||||
- void (*parent)() nogil,
|
||||
- void (*child)() nogil)
|
||||
+ void (*prepare)() noexcept nogil,
|
||||
+ void (*parent)() noexcept nogil,
|
||||
+ void (*child)() noexcept nogil) noexcept
|
||||
|
||||
|
||||
-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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
|
||||
index 53657e8..d4d1cff 100644
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/fork_posix.pyx.pxi
|
||||
@@ -34,7 +34,7 @@ _GRPC_ENABLE_FORK_SUPPORT = (
|
||||
|
||||
_fork_handler_failed = False
|
||||
|
||||
-cdef void __prefork() nogil:
|
||||
+cdef void __prefork() noexcept nogil:
|
||||
with gil:
|
||||
global _fork_handler_failed
|
||||
_fork_handler_failed = False
|
||||
@@ -48,14 +48,14 @@ cdef void __prefork() nogil:
|
||||
_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 --git a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
|
||||
index da4b81b..f594100 100644
|
||||
--- a/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
|
||||
+++ b/src/python/grpcio/grpc/_cython/_cygrpc/vtable.pyx.pxi
|
||||
@@ -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:
|
||||
--
|
||||
2.41.0
|
||||
|
|
@ -1,28 +0,0 @@
|
|||
From 209e9e0c21dd5bdf62d943dfd9caca40565734b5 Mon Sep 17 00:00:00 2001
|
||||
From: Georgy Yakovlev <gyakovlev@gentoo.org>
|
||||
Date: Mon, 28 Nov 2022 14:08:17 -0800
|
||||
Subject: [PATCH] respect CC variable
|
||||
|
||||
https://github.com/grpc/grpc/pull/26480
|
||||
Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
|
||||
---
|
||||
src/python/grpcio/commands.py | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/python/grpcio/commands.py b/src/python/grpcio/commands.py
|
||||
index 58ab57be47..6d8228ffa0 100644
|
||||
--- a/src/python/grpcio/commands.py
|
||||
+++ b/src/python/grpcio/commands.py
|
||||
@@ -228,7 +228,8 @@ class BuildExt(build_ext.build_ext):
|
||||
"""
|
||||
try:
|
||||
# TODO(lidiz) Remove the generated a.out for success tests.
|
||||
- cc_test = subprocess.Popen(['cc', '-x', 'c', '-std=c++14', '-'],
|
||||
+ cc = os.environ.get('CC', 'cc')
|
||||
+ cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++14', '-'],
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE)
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -1,50 +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 ~ppc64 ~riscv x86"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-libs/openssl-1.1.1:0=[-bindist(-)]
|
||||
>=dev-libs/re2-0.2021.11.01:=
|
||||
<dev-python/protobuf-python-5[${PYTHON_USEDEP}]
|
||||
>=dev-python/protobuf-python-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.51.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,12 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>gyakovlev@gentoo.org</email>
|
||||
<name>Georgy Yakovlev</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">grpc/grpc</remote-id>
|
||||
<remote-id type="pypi">grpcio</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
Loading…
Reference in a new issue