* [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/
@ 2019-08-17 3:00 Georgy Yakovlev
0 siblings, 0 replies; 6+ messages in thread
From: Georgy Yakovlev @ 2019-08-17 3:00 UTC (permalink / raw
To: gentoo-commits
commit: d79c4095a579f9f218f8075d940767428e4fa2e2
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 17 02:25:28 2019 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 02:59:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79c4095
dev-python/grpcio: bump to 1.23.0
Bug: https://bugs.gentoo.org/691836
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-python/grpcio/Manifest | 1 +
.../files/grpc-1.22.1-glibc-2.30-compat.patch | 78 ++++++++++++++++++++++
dev-python/grpcio/grpcio-1.23.0.ebuild | 40 +++++++++++
3 files changed, 119 insertions(+)
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 64ee49ad70a..d799ec48bb7 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -5,3 +5,4 @@ DIST grpcio-1.19.0.tar.gz 14621509 BLAKE2B b756ba60d317baa089b8ee57c458bc68fb72e
DIST grpcio-1.20.1.tar.gz 13882426 BLAKE2B 4211d9dedc7ba858a5124798f17b3b158f255d055f32f5947191fcb5fd45cca9c97aa3f8c4966e7195add5289ba3747a77b2f0c01a35762ffbeba6938c76046d SHA512 0ac126d8b2c25204bb03daccfc9b17016bc18dd31f89f6e208f2ae39d7e6fd17ae04a8178367a5334421d959b14fd3d31ac71a692b48a060d98f983553fcc3e2
DIST grpcio-1.21.1.tar.gz 13919484 BLAKE2B dcad98da8db4aa588facc30d1b010ec1e4d5f8085751422277631329f1c4949ba3e2c3882829354025a845992ba9972df1c48a277df93caef9015969f9423aef SHA512 0ea20490ce5e776a6253d4b89dd9d9091afb7462d6bd6bd9d2d3329979d61360a3e31abbd043b90d0908512cf7ff2668bb21cb472fbf0ad5a3b5963073850dd7
DIST grpcio-1.22.0.tar.gz 13925872 BLAKE2B 96cb2244e6fe11c628349b21026906336981d51661474f4e871ad33125cd183255cd9eb2de2eca9af00f80ddd1989dde80e60cdbe5bc833225980c63e12c92fc SHA512 912672209e2192fadaef79fe6cd79575d386e54ca0362f43e8e7138ca1f3673ea6a55f884257e9fb1780bae78664816675279a7f5ee799cc5d25ae43287729b1
+DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
diff --git a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
new file mode 100644
index 00000000000..90bd9115893
--- /dev/null
+++ b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
@@ -0,0 +1,78 @@
+From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
+From: Benjamin Peterson <benjamin@dropbox.com>
+Date: Fri, 3 May 2019 08:11:00 -0700
+Subject: [PATCH] Rename gettid() functions.
+
+glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
+---
+ src/core/lib/gpr/log_linux.cc | 4 ++--
+ src/core/lib/gpr/log_posix.cc | 4 ++--
+ src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
+index 561276f0c20..8b597b4cf2f 100644
+--- a/src/core/lib/gpr/log_linux.cc
++++ b/src/core/lib/gpr/log_linux.cc
+@@ -40,7 +40,7 @@
+ #include <time.h>
+ #include <unistd.h>
+
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+ const char* format, ...) {
+@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+ gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
+ struct tm tm;
+ static __thread long tid = 0;
+- if (tid == 0) tid = gettid();
++ if (tid == 0) tid = sys_gettid();
+
+ timer = static_cast<time_t>(now.tv_sec);
+ final_slash = strrchr(args->file, '/');
+diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
+index b6edc14ab6b..2f7c6ce3760 100644
+--- a/src/core/lib/gpr/log_posix.cc
++++ b/src/core/lib/gpr/log_posix.cc
+@@ -31,7 +31,7 @@
+ #include <string.h>
+ #include <time.h>
+
+-static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
++static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
+
+ void gpr_log(const char* file, int line, gpr_log_severity severity,
+ const char* format, ...) {
+@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
+ char* prefix;
+ gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
+ gpr_log_severity_string(args->severity), time_buffer,
+- (int)(now.tv_nsec), gettid(), display_file, args->line);
++ (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
+
+ fprintf(stderr, "%-70s %s\n", prefix, args->message);
+ gpr_free(prefix);
+diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
+index 08116b3ab53..76f59844312 100644
+--- a/src/core/lib/iomgr/ev_epollex_linux.cc
++++ b/src/core/lib/iomgr/ev_epollex_linux.cc
+@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
+ }
+
+ #ifndef NDEBUG
+-static long gettid(void) { return syscall(__NR_gettid); }
++static long sys_gettid(void) { return syscall(__NR_gettid); }
+ #endif
+
+ /* pollset->mu lock must be held by the caller before calling this.
+@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
+ #define WORKER_PTR (&worker)
+ #endif
+ #ifndef NDEBUG
+- WORKER_PTR->originator = gettid();
++ WORKER_PTR->originator = sys_gettid();
+ #endif
+ if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+ gpr_log(GPR_INFO,
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
new file mode 100644
index 00000000000..62916667f92
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.23.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
+ >=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ net-dns/c-ares:=
+ !<net-libs/grpc-1.16.0[python]
+ sys-libs/zlib:=
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
+
+python_configure_all() {
+ 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_ZLIB=1
+ export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+ export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/
@ 2020-01-17 10:22 Georgy Yakovlev
0 siblings, 0 replies; 6+ messages in thread
From: Georgy Yakovlev @ 2020-01-17 10:22 UTC (permalink / raw
To: gentoo-commits
commit: f5caa3775e78ca9e2501ab818692f5c22c31e46f
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 17 10:18:03 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Jan 17 10:20:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5caa377
dev-python/grpcio: revbump 1.26.0, fix odr violation
Closes: https://bugs.gentoo.org/705574
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
.../grpcio/files/grpc-1.26-fix-odr-violation.patch | 421 +++++++++++++++++++++
...rpcio-1.26.0.ebuild => grpcio-1.26.0-r1.ebuild} | 2 +
2 files changed, 423 insertions(+)
diff --git a/dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch b/dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch
new file mode 100644
index 00000000000..695ec4efe16
--- /dev/null
+++ b/dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch
@@ -0,0 +1,421 @@
+From 72351f63fd650cc7acfcd2d0307e8e8e8f777283 Mon Sep 17 00:00:00 2001
+From: Esun Kim <veblush@google.com>
+Date: Tue, 14 Jan 2020 16:35:23 -0800
+Subject: [PATCH] Remove grpc sources from grpc++
+
+diff --git a/Makefile b/Makefile
+index f8bd36f62f6..b25c748d3a9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -5695,205 +5695,7 @@ LIBGRPC++_SRC = \
+ src/cpp/util/status.cc \
+ src/cpp/util/string_ref.cc \
+ src/cpp/util/time_cc.cc \
+- src/core/ext/filters/client_channel/backend_metric.cc \
+- src/core/ext/filters/client_channel/backup_poller.cc \
+- src/core/ext/filters/client_channel/channel_connectivity.cc \
+- src/core/ext/filters/client_channel/client_channel.cc \
+- src/core/ext/filters/client_channel/client_channel_channelz.cc \
+- src/core/ext/filters/client_channel/client_channel_factory.cc \
+- src/core/ext/filters/client_channel/client_channel_plugin.cc \
+- src/core/ext/filters/client_channel/global_subchannel_pool.cc \
+- src/core/ext/filters/client_channel/health/health_check_client.cc \
+- src/core/ext/filters/client_channel/http_connect_handshaker.cc \
+- src/core/ext/filters/client_channel/http_proxy.cc \
+- src/core/ext/filters/client_channel/lb_policy.cc \
+- src/core/ext/filters/client_channel/lb_policy_registry.cc \
+- src/core/ext/filters/client_channel/local_subchannel_pool.cc \
+- src/core/ext/filters/client_channel/parse_address.cc \
+- src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
+- src/core/ext/filters/client_channel/resolver.cc \
+- src/core/ext/filters/client_channel/resolver_registry.cc \
+- src/core/ext/filters/client_channel/resolver_result_parsing.cc \
+- src/core/ext/filters/client_channel/resolving_lb_policy.cc \
+- src/core/ext/filters/client_channel/retry_throttle.cc \
+- src/core/ext/filters/client_channel/server_address.cc \
+- src/core/ext/filters/client_channel/service_config.cc \
+- src/core/ext/filters/client_channel/subchannel.cc \
+- src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
+- src/core/lib/avl/avl.cc \
+- src/core/lib/backoff/backoff.cc \
+- src/core/lib/channel/channel_args.cc \
+- src/core/lib/channel/channel_stack.cc \
+- src/core/lib/channel/channel_stack_builder.cc \
+- src/core/lib/channel/channel_trace.cc \
+- src/core/lib/channel/channelz.cc \
+- src/core/lib/channel/channelz_registry.cc \
+- src/core/lib/channel/connected_channel.cc \
+- src/core/lib/channel/handshaker.cc \
+- src/core/lib/channel/handshaker_registry.cc \
+- src/core/lib/channel/status_util.cc \
+- src/core/lib/compression/compression.cc \
+- src/core/lib/compression/compression_args.cc \
+- src/core/lib/compression/compression_internal.cc \
+- src/core/lib/compression/message_compress.cc \
+- src/core/lib/compression/stream_compression.cc \
+- src/core/lib/compression/stream_compression_gzip.cc \
+- src/core/lib/compression/stream_compression_identity.cc \
+- src/core/lib/debug/stats.cc \
+- src/core/lib/debug/stats_data.cc \
+- src/core/lib/http/format_request.cc \
+- src/core/lib/http/httpcli.cc \
+- src/core/lib/http/parser.cc \
+- src/core/lib/iomgr/buffer_list.cc \
+- src/core/lib/iomgr/call_combiner.cc \
+- src/core/lib/iomgr/cfstream_handle.cc \
+- src/core/lib/iomgr/combiner.cc \
+- src/core/lib/iomgr/endpoint.cc \
+- src/core/lib/iomgr/endpoint_cfstream.cc \
+- src/core/lib/iomgr/endpoint_pair_posix.cc \
+- src/core/lib/iomgr/endpoint_pair_uv.cc \
+- src/core/lib/iomgr/endpoint_pair_windows.cc \
+- src/core/lib/iomgr/error.cc \
+- src/core/lib/iomgr/error_cfstream.cc \
+- src/core/lib/iomgr/ev_epoll1_linux.cc \
+- src/core/lib/iomgr/ev_epollex_linux.cc \
+- src/core/lib/iomgr/ev_poll_posix.cc \
+- src/core/lib/iomgr/ev_posix.cc \
+- src/core/lib/iomgr/ev_windows.cc \
+- src/core/lib/iomgr/exec_ctx.cc \
+- src/core/lib/iomgr/executor.cc \
+- src/core/lib/iomgr/executor/mpmcqueue.cc \
+- src/core/lib/iomgr/executor/threadpool.cc \
+- src/core/lib/iomgr/fork_posix.cc \
+- src/core/lib/iomgr/fork_windows.cc \
+- src/core/lib/iomgr/gethostname_fallback.cc \
+- src/core/lib/iomgr/gethostname_host_name_max.cc \
+- src/core/lib/iomgr/gethostname_sysconf.cc \
+- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
+- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
+- src/core/lib/iomgr/internal_errqueue.cc \
+- src/core/lib/iomgr/iocp_windows.cc \
+- src/core/lib/iomgr/iomgr.cc \
+- src/core/lib/iomgr/iomgr_custom.cc \
+- src/core/lib/iomgr/iomgr_internal.cc \
+- src/core/lib/iomgr/iomgr_posix.cc \
+- src/core/lib/iomgr/iomgr_posix_cfstream.cc \
+- src/core/lib/iomgr/iomgr_uv.cc \
+- src/core/lib/iomgr/iomgr_windows.cc \
+- src/core/lib/iomgr/is_epollexclusive_available.cc \
+- src/core/lib/iomgr/load_file.cc \
+- src/core/lib/iomgr/lockfree_event.cc \
+- src/core/lib/iomgr/logical_thread.cc \
+- src/core/lib/iomgr/polling_entity.cc \
+- src/core/lib/iomgr/pollset.cc \
+- src/core/lib/iomgr/pollset_custom.cc \
+- src/core/lib/iomgr/pollset_set.cc \
+- src/core/lib/iomgr/pollset_set_custom.cc \
+- src/core/lib/iomgr/pollset_set_windows.cc \
+- src/core/lib/iomgr/pollset_uv.cc \
+- src/core/lib/iomgr/pollset_windows.cc \
+- src/core/lib/iomgr/resolve_address.cc \
+- src/core/lib/iomgr/resolve_address_custom.cc \
+- src/core/lib/iomgr/resolve_address_posix.cc \
+- src/core/lib/iomgr/resolve_address_windows.cc \
+- src/core/lib/iomgr/resource_quota.cc \
+- src/core/lib/iomgr/sockaddr_utils.cc \
+- src/core/lib/iomgr/socket_factory_posix.cc \
+- src/core/lib/iomgr/socket_mutator.cc \
+- src/core/lib/iomgr/socket_utils_common_posix.cc \
+- src/core/lib/iomgr/socket_utils_linux.cc \
+- src/core/lib/iomgr/socket_utils_posix.cc \
+- src/core/lib/iomgr/socket_utils_uv.cc \
+- src/core/lib/iomgr/socket_utils_windows.cc \
+- src/core/lib/iomgr/socket_windows.cc \
+- src/core/lib/iomgr/tcp_client.cc \
+- src/core/lib/iomgr/tcp_client_cfstream.cc \
+- src/core/lib/iomgr/tcp_client_custom.cc \
+- src/core/lib/iomgr/tcp_client_posix.cc \
+- src/core/lib/iomgr/tcp_client_windows.cc \
+- src/core/lib/iomgr/tcp_custom.cc \
+- src/core/lib/iomgr/tcp_posix.cc \
+- src/core/lib/iomgr/tcp_server.cc \
+- src/core/lib/iomgr/tcp_server_custom.cc \
+- src/core/lib/iomgr/tcp_server_posix.cc \
+- src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
+- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
+- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
+- src/core/lib/iomgr/tcp_server_windows.cc \
+- src/core/lib/iomgr/tcp_uv.cc \
+- src/core/lib/iomgr/tcp_windows.cc \
+- src/core/lib/iomgr/time_averaged_stats.cc \
+- src/core/lib/iomgr/timer.cc \
+- src/core/lib/iomgr/timer_custom.cc \
+- src/core/lib/iomgr/timer_generic.cc \
+- src/core/lib/iomgr/timer_heap.cc \
+- src/core/lib/iomgr/timer_manager.cc \
+- src/core/lib/iomgr/timer_uv.cc \
+- src/core/lib/iomgr/udp_server.cc \
+- src/core/lib/iomgr/unix_sockets_posix.cc \
+- src/core/lib/iomgr/unix_sockets_posix_noop.cc \
+- src/core/lib/iomgr/wakeup_fd_eventfd.cc \
+- src/core/lib/iomgr/wakeup_fd_nospecial.cc \
+- src/core/lib/iomgr/wakeup_fd_pipe.cc \
+- src/core/lib/iomgr/wakeup_fd_posix.cc \
+- src/core/lib/json/json.cc \
+- src/core/lib/json/json_reader.cc \
+- src/core/lib/json/json_string.cc \
+- src/core/lib/json/json_writer.cc \
+- src/core/lib/slice/b64.cc \
+- src/core/lib/slice/percent_encoding.cc \
+- src/core/lib/slice/slice.cc \
+- src/core/lib/slice/slice_buffer.cc \
+- src/core/lib/slice/slice_intern.cc \
+- src/core/lib/slice/slice_string_helpers.cc \
+- src/core/lib/surface/api_trace.cc \
+- src/core/lib/surface/byte_buffer.cc \
+- src/core/lib/surface/byte_buffer_reader.cc \
+- src/core/lib/surface/call.cc \
+- src/core/lib/surface/call_details.cc \
+- src/core/lib/surface/call_log_batch.cc \
+- src/core/lib/surface/channel.cc \
+- src/core/lib/surface/channel_init.cc \
+- src/core/lib/surface/channel_ping.cc \
+- src/core/lib/surface/channel_stack_type.cc \
+- src/core/lib/surface/completion_queue.cc \
+- src/core/lib/surface/completion_queue_factory.cc \
+- src/core/lib/surface/event_string.cc \
+- src/core/lib/surface/lame_client.cc \
+- src/core/lib/surface/metadata_array.cc \
+- src/core/lib/surface/server.cc \
+- src/core/lib/surface/validate_metadata.cc \
+- src/core/lib/surface/version.cc \
+- src/core/lib/transport/bdp_estimator.cc \
+- src/core/lib/transport/byte_stream.cc \
+- src/core/lib/transport/connectivity_state.cc \
+- src/core/lib/transport/error_utils.cc \
+- src/core/lib/transport/metadata.cc \
+- src/core/lib/transport/metadata_batch.cc \
+- src/core/lib/transport/pid_controller.cc \
+- src/core/lib/transport/static_metadata.cc \
+- src/core/lib/transport/status_conversion.cc \
+- src/core/lib/transport/status_metadata.cc \
+- src/core/lib/transport/timeout_encoding.cc \
+- src/core/lib/transport/transport.cc \
+- src/core/lib/transport/transport_op_string.cc \
+- src/core/lib/uri/uri_parser.cc \
+- src/core/lib/debug/trace.cc \
+- src/core/ext/filters/deadline/deadline_filter.cc \
+ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
+- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
+- src/core/ext/upb-generated/gogoproto/gogo.upb.c \
+- src/core/ext/upb-generated/validate/validate.upb.c \
+- src/core/ext/upb-generated/google/api/annotations.upb.c \
+- src/core/ext/upb-generated/google/api/http.upb.c \
+- src/core/ext/upb-generated/google/protobuf/any.upb.c \
+- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
+- src/core/ext/upb-generated/google/protobuf/duration.upb.c \
+- src/core/ext/upb-generated/google/protobuf/empty.upb.c \
+- src/core/ext/upb-generated/google/protobuf/struct.upb.c \
+- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
+- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
+- src/core/ext/upb-generated/google/rpc/status.upb.c \
+ src/cpp/codegen/codegen_init.cc \
+
+ PUBLIC_HEADERS_CXX += \
+@@ -6926,205 +6728,7 @@ LIBGRPC++_UNSECURE_SRC = \
+ src/cpp/util/status.cc \
+ src/cpp/util/string_ref.cc \
+ src/cpp/util/time_cc.cc \
+- src/core/ext/filters/client_channel/backend_metric.cc \
+- src/core/ext/filters/client_channel/backup_poller.cc \
+- src/core/ext/filters/client_channel/channel_connectivity.cc \
+- src/core/ext/filters/client_channel/client_channel.cc \
+- src/core/ext/filters/client_channel/client_channel_channelz.cc \
+- src/core/ext/filters/client_channel/client_channel_factory.cc \
+- src/core/ext/filters/client_channel/client_channel_plugin.cc \
+- src/core/ext/filters/client_channel/global_subchannel_pool.cc \
+- src/core/ext/filters/client_channel/health/health_check_client.cc \
+- src/core/ext/filters/client_channel/http_connect_handshaker.cc \
+- src/core/ext/filters/client_channel/http_proxy.cc \
+- src/core/ext/filters/client_channel/lb_policy.cc \
+- src/core/ext/filters/client_channel/lb_policy_registry.cc \
+- src/core/ext/filters/client_channel/local_subchannel_pool.cc \
+- src/core/ext/filters/client_channel/parse_address.cc \
+- src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
+- src/core/ext/filters/client_channel/resolver.cc \
+- src/core/ext/filters/client_channel/resolver_registry.cc \
+- src/core/ext/filters/client_channel/resolver_result_parsing.cc \
+- src/core/ext/filters/client_channel/resolving_lb_policy.cc \
+- src/core/ext/filters/client_channel/retry_throttle.cc \
+- src/core/ext/filters/client_channel/server_address.cc \
+- src/core/ext/filters/client_channel/service_config.cc \
+- src/core/ext/filters/client_channel/subchannel.cc \
+- src/core/ext/filters/client_channel/subchannel_pool_interface.cc \
+- src/core/lib/avl/avl.cc \
+- src/core/lib/backoff/backoff.cc \
+- src/core/lib/channel/channel_args.cc \
+- src/core/lib/channel/channel_stack.cc \
+- src/core/lib/channel/channel_stack_builder.cc \
+- src/core/lib/channel/channel_trace.cc \
+- src/core/lib/channel/channelz.cc \
+- src/core/lib/channel/channelz_registry.cc \
+- src/core/lib/channel/connected_channel.cc \
+- src/core/lib/channel/handshaker.cc \
+- src/core/lib/channel/handshaker_registry.cc \
+- src/core/lib/channel/status_util.cc \
+- src/core/lib/compression/compression.cc \
+- src/core/lib/compression/compression_args.cc \
+- src/core/lib/compression/compression_internal.cc \
+- src/core/lib/compression/message_compress.cc \
+- src/core/lib/compression/stream_compression.cc \
+- src/core/lib/compression/stream_compression_gzip.cc \
+- src/core/lib/compression/stream_compression_identity.cc \
+- src/core/lib/debug/stats.cc \
+- src/core/lib/debug/stats_data.cc \
+- src/core/lib/http/format_request.cc \
+- src/core/lib/http/httpcli.cc \
+- src/core/lib/http/parser.cc \
+- src/core/lib/iomgr/buffer_list.cc \
+- src/core/lib/iomgr/call_combiner.cc \
+- src/core/lib/iomgr/cfstream_handle.cc \
+- src/core/lib/iomgr/combiner.cc \
+- src/core/lib/iomgr/endpoint.cc \
+- src/core/lib/iomgr/endpoint_cfstream.cc \
+- src/core/lib/iomgr/endpoint_pair_posix.cc \
+- src/core/lib/iomgr/endpoint_pair_uv.cc \
+- src/core/lib/iomgr/endpoint_pair_windows.cc \
+- src/core/lib/iomgr/error.cc \
+- src/core/lib/iomgr/error_cfstream.cc \
+- src/core/lib/iomgr/ev_epoll1_linux.cc \
+- src/core/lib/iomgr/ev_epollex_linux.cc \
+- src/core/lib/iomgr/ev_poll_posix.cc \
+- src/core/lib/iomgr/ev_posix.cc \
+- src/core/lib/iomgr/ev_windows.cc \
+- src/core/lib/iomgr/exec_ctx.cc \
+- src/core/lib/iomgr/executor.cc \
+- src/core/lib/iomgr/executor/mpmcqueue.cc \
+- src/core/lib/iomgr/executor/threadpool.cc \
+- src/core/lib/iomgr/fork_posix.cc \
+- src/core/lib/iomgr/fork_windows.cc \
+- src/core/lib/iomgr/gethostname_fallback.cc \
+- src/core/lib/iomgr/gethostname_host_name_max.cc \
+- src/core/lib/iomgr/gethostname_sysconf.cc \
+- src/core/lib/iomgr/grpc_if_nametoindex_posix.cc \
+- src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc \
+- src/core/lib/iomgr/internal_errqueue.cc \
+- src/core/lib/iomgr/iocp_windows.cc \
+- src/core/lib/iomgr/iomgr.cc \
+- src/core/lib/iomgr/iomgr_custom.cc \
+- src/core/lib/iomgr/iomgr_internal.cc \
+- src/core/lib/iomgr/iomgr_posix.cc \
+- src/core/lib/iomgr/iomgr_posix_cfstream.cc \
+- src/core/lib/iomgr/iomgr_uv.cc \
+- src/core/lib/iomgr/iomgr_windows.cc \
+- src/core/lib/iomgr/is_epollexclusive_available.cc \
+- src/core/lib/iomgr/load_file.cc \
+- src/core/lib/iomgr/lockfree_event.cc \
+- src/core/lib/iomgr/logical_thread.cc \
+- src/core/lib/iomgr/polling_entity.cc \
+- src/core/lib/iomgr/pollset.cc \
+- src/core/lib/iomgr/pollset_custom.cc \
+- src/core/lib/iomgr/pollset_set.cc \
+- src/core/lib/iomgr/pollset_set_custom.cc \
+- src/core/lib/iomgr/pollset_set_windows.cc \
+- src/core/lib/iomgr/pollset_uv.cc \
+- src/core/lib/iomgr/pollset_windows.cc \
+- src/core/lib/iomgr/resolve_address.cc \
+- src/core/lib/iomgr/resolve_address_custom.cc \
+- src/core/lib/iomgr/resolve_address_posix.cc \
+- src/core/lib/iomgr/resolve_address_windows.cc \
+- src/core/lib/iomgr/resource_quota.cc \
+- src/core/lib/iomgr/sockaddr_utils.cc \
+- src/core/lib/iomgr/socket_factory_posix.cc \
+- src/core/lib/iomgr/socket_mutator.cc \
+- src/core/lib/iomgr/socket_utils_common_posix.cc \
+- src/core/lib/iomgr/socket_utils_linux.cc \
+- src/core/lib/iomgr/socket_utils_posix.cc \
+- src/core/lib/iomgr/socket_utils_uv.cc \
+- src/core/lib/iomgr/socket_utils_windows.cc \
+- src/core/lib/iomgr/socket_windows.cc \
+- src/core/lib/iomgr/tcp_client.cc \
+- src/core/lib/iomgr/tcp_client_cfstream.cc \
+- src/core/lib/iomgr/tcp_client_custom.cc \
+- src/core/lib/iomgr/tcp_client_posix.cc \
+- src/core/lib/iomgr/tcp_client_windows.cc \
+- src/core/lib/iomgr/tcp_custom.cc \
+- src/core/lib/iomgr/tcp_posix.cc \
+- src/core/lib/iomgr/tcp_server.cc \
+- src/core/lib/iomgr/tcp_server_custom.cc \
+- src/core/lib/iomgr/tcp_server_posix.cc \
+- src/core/lib/iomgr/tcp_server_utils_posix_common.cc \
+- src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc \
+- src/core/lib/iomgr/tcp_server_utils_posix_noifaddrs.cc \
+- src/core/lib/iomgr/tcp_server_windows.cc \
+- src/core/lib/iomgr/tcp_uv.cc \
+- src/core/lib/iomgr/tcp_windows.cc \
+- src/core/lib/iomgr/time_averaged_stats.cc \
+- src/core/lib/iomgr/timer.cc \
+- src/core/lib/iomgr/timer_custom.cc \
+- src/core/lib/iomgr/timer_generic.cc \
+- src/core/lib/iomgr/timer_heap.cc \
+- src/core/lib/iomgr/timer_manager.cc \
+- src/core/lib/iomgr/timer_uv.cc \
+- src/core/lib/iomgr/udp_server.cc \
+- src/core/lib/iomgr/unix_sockets_posix.cc \
+- src/core/lib/iomgr/unix_sockets_posix_noop.cc \
+- src/core/lib/iomgr/wakeup_fd_eventfd.cc \
+- src/core/lib/iomgr/wakeup_fd_nospecial.cc \
+- src/core/lib/iomgr/wakeup_fd_pipe.cc \
+- src/core/lib/iomgr/wakeup_fd_posix.cc \
+- src/core/lib/json/json.cc \
+- src/core/lib/json/json_reader.cc \
+- src/core/lib/json/json_string.cc \
+- src/core/lib/json/json_writer.cc \
+- src/core/lib/slice/b64.cc \
+- src/core/lib/slice/percent_encoding.cc \
+- src/core/lib/slice/slice.cc \
+- src/core/lib/slice/slice_buffer.cc \
+- src/core/lib/slice/slice_intern.cc \
+- src/core/lib/slice/slice_string_helpers.cc \
+- src/core/lib/surface/api_trace.cc \
+- src/core/lib/surface/byte_buffer.cc \
+- src/core/lib/surface/byte_buffer_reader.cc \
+- src/core/lib/surface/call.cc \
+- src/core/lib/surface/call_details.cc \
+- src/core/lib/surface/call_log_batch.cc \
+- src/core/lib/surface/channel.cc \
+- src/core/lib/surface/channel_init.cc \
+- src/core/lib/surface/channel_ping.cc \
+- src/core/lib/surface/channel_stack_type.cc \
+- src/core/lib/surface/completion_queue.cc \
+- src/core/lib/surface/completion_queue_factory.cc \
+- src/core/lib/surface/event_string.cc \
+- src/core/lib/surface/lame_client.cc \
+- src/core/lib/surface/metadata_array.cc \
+- src/core/lib/surface/server.cc \
+- src/core/lib/surface/validate_metadata.cc \
+- src/core/lib/surface/version.cc \
+- src/core/lib/transport/bdp_estimator.cc \
+- src/core/lib/transport/byte_stream.cc \
+- src/core/lib/transport/connectivity_state.cc \
+- src/core/lib/transport/error_utils.cc \
+- src/core/lib/transport/metadata.cc \
+- src/core/lib/transport/metadata_batch.cc \
+- src/core/lib/transport/pid_controller.cc \
+- src/core/lib/transport/static_metadata.cc \
+- src/core/lib/transport/status_conversion.cc \
+- src/core/lib/transport/status_metadata.cc \
+- src/core/lib/transport/timeout_encoding.cc \
+- src/core/lib/transport/transport.cc \
+- src/core/lib/transport/transport_op_string.cc \
+- src/core/lib/uri/uri_parser.cc \
+- src/core/lib/debug/trace.cc \
+- src/core/ext/filters/deadline/deadline_filter.cc \
+ src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
+- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
+- src/core/ext/upb-generated/gogoproto/gogo.upb.c \
+- src/core/ext/upb-generated/validate/validate.upb.c \
+- src/core/ext/upb-generated/google/api/annotations.upb.c \
+- src/core/ext/upb-generated/google/api/http.upb.c \
+- src/core/ext/upb-generated/google/protobuf/any.upb.c \
+- src/core/ext/upb-generated/google/protobuf/descriptor.upb.c \
+- src/core/ext/upb-generated/google/protobuf/duration.upb.c \
+- src/core/ext/upb-generated/google/protobuf/empty.upb.c \
+- src/core/ext/upb-generated/google/protobuf/struct.upb.c \
+- src/core/ext/upb-generated/google/protobuf/timestamp.upb.c \
+- src/core/ext/upb-generated/google/protobuf/wrappers.upb.c \
+- src/core/ext/upb-generated/google/rpc/status.upb.c \
+ src/cpp/codegen/codegen_init.cc \
+
+ PUBLIC_HEADERS_CXX += \
diff --git a/dev-python/grpcio/grpcio-1.26.0.ebuild b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
similarity index 94%
rename from dev-python/grpcio/grpcio-1.26.0.ebuild
rename to dev-python/grpcio/grpcio-1.26.0-r1.ebuild
index 17a9aec6e89..060f3291867 100644
--- a/dev-python/grpcio/grpcio-1.26.0.ebuild
+++ b/dev-python/grpcio/grpcio-1.26.0-r1.ebuild
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
"
+PATCHES=( "${FILESDIR}/grpc-1.26-fix-odr-violation.patch" )
+
python_configure_all() {
export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/
@ 2020-03-27 10:42 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2020-03-27 10:42 UTC (permalink / raw
To: gentoo-commits
commit: 969ae5027c01ca71a0b74f039008d22d5db01086
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 10:39:18 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 10:42:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=969ae502
dev-python/grpcio: Remove redundant versions
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/grpcio/Manifest | 3 -
.../files/grpc-1.22.1-glibc-2.30-compat.patch | 78 ----------------------
dev-python/grpcio/grpcio-1.22.1.ebuild | 38 -----------
dev-python/grpcio/grpcio-1.23.0.ebuild | 38 -----------
dev-python/grpcio/grpcio-1.24.3.ebuild | 36 ----------
5 files changed, 193 deletions(-)
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index b6c0017e638..bff63af10b6 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,4 +1 @@
-DIST grpcio-1.22.1.tar.gz 13923342 BLAKE2B 6d211b93a7597f568d106e0d6e3d30b90d7b4bf6fae42b163f2ae04e01c4b323c4d7c2a5380ccdbab14f9a6986c86fae4948bc827a97c189f915bc24738fc426 SHA512 5392041a021b0523fc7a615070ea0f907fc960cb69ffba1e7fcdf0aa8e498cb33f567d9eec795dc06662f558884dcabcc17a1ae4a26fcaa479b0a43c08e8b913
-DIST grpcio-1.23.0.tar.gz 13977223 BLAKE2B b9f95aaf397eae9610280937980e4b2694af98e6cd5f80015dd83c67ec6bf9c41e76474f873627d6c6cc35fe9af3b45f14aabb6ea809b51cf5f0bb0f3b702794 SHA512 ff3cd9d2380a158ea7a49ba2c9cd5bd1ec98194aa48cf2d45596ab93f0e8a6d6ed0291e5dfc52bca79c62950e6a0ce387819d19f036c0dd1e6dc7b737c1ee97f
-DIST grpcio-1.24.3.tar.gz 14030592 BLAKE2B aa9e61c692937d7fc06d0fb601f7632a6ac5fb165aabec9e7993cf1fa41254b004fff89f650f390544e5fb1972dca542169ce0fdae79a71d775fe3cbb44a2d95 SHA512 0dc90de5a06b9af7fa91d3e96117f69813e5fee31499e8e48daac7d164856594f164a434d3dd28d6e0220e417926aadceabb9b7597e86a6bb87d8943e6661dce
DIST grpcio-1.26.0.tar.gz 15406206 BLAKE2B 4a9031e1d9e9285d1c1ee90396ae339a47715fa2c279f5bce517e3ea02bdc755e3044e3e402f73b3d797a6b1415f58396097a55ba16200c7f9d4569b0b159fe3 SHA512 df3b6787449c202f3e70640907c76231dbbeb6b411167300ba8a53c17f7d45ffa513a81046a4a66a368f2c17c2d57a48a07cb236f44a005e4073bd5d8aa3865c
diff --git a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch b/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
deleted file mode 100644
index 90bd9115893..00000000000
--- a/dev-python/grpcio/files/grpc-1.22.1-glibc-2.30-compat.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From d1d017390b799c59d6fdf7b8afa6136d218bdd61 Mon Sep 17 00:00:00 2001
-From: Benjamin Peterson <benjamin@dropbox.com>
-Date: Fri, 3 May 2019 08:11:00 -0700
-Subject: [PATCH] Rename gettid() functions.
-
-glibc 2.30 will declare its own gettid; see https://sourceware.org/git/?p=glibc.git;a=commit;h=1d0fc213824eaa2a8f8c4385daaa698ee8fb7c92. Rename the grpc versions to avoid naming conflicts.
----
- src/core/lib/gpr/log_linux.cc | 4 ++--
- src/core/lib/gpr/log_posix.cc | 4 ++--
- src/core/lib/iomgr/ev_epollex_linux.cc | 4 ++--
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/core/lib/gpr/log_linux.cc b/src/core/lib/gpr/log_linux.cc
-index 561276f0c20..8b597b4cf2f 100644
---- a/src/core/lib/gpr/log_linux.cc
-+++ b/src/core/lib/gpr/log_linux.cc
-@@ -40,7 +40,7 @@
- #include <time.h>
- #include <unistd.h>
-
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long sys_gettid(void) { return syscall(__NR_gettid); }
-
- void gpr_log(const char* file, int line, gpr_log_severity severity,
- const char* format, ...) {
-@@ -70,7 +70,7 @@ void gpr_default_log(gpr_log_func_args* args) {
- gpr_timespec now = gpr_now(GPR_CLOCK_REALTIME);
- struct tm tm;
- static __thread long tid = 0;
-- if (tid == 0) tid = gettid();
-+ if (tid == 0) tid = sys_gettid();
-
- timer = static_cast<time_t>(now.tv_sec);
- final_slash = strrchr(args->file, '/');
-diff --git a/src/core/lib/gpr/log_posix.cc b/src/core/lib/gpr/log_posix.cc
-index b6edc14ab6b..2f7c6ce3760 100644
---- a/src/core/lib/gpr/log_posix.cc
-+++ b/src/core/lib/gpr/log_posix.cc
-@@ -31,7 +31,7 @@
- #include <string.h>
- #include <time.h>
-
--static intptr_t gettid(void) { return (intptr_t)pthread_self(); }
-+static intptr_t sys_gettid(void) { return (intptr_t)pthread_self(); }
-
- void gpr_log(const char* file, int line, gpr_log_severity severity,
- const char* format, ...) {
-@@ -86,7 +86,7 @@ void gpr_default_log(gpr_log_func_args* args) {
- char* prefix;
- gpr_asprintf(&prefix, "%s%s.%09d %7" PRIdPTR " %s:%d]",
- gpr_log_severity_string(args->severity), time_buffer,
-- (int)(now.tv_nsec), gettid(), display_file, args->line);
-+ (int)(now.tv_nsec), sys_gettid(), display_file, args->line);
-
- fprintf(stderr, "%-70s %s\n", prefix, args->message);
- gpr_free(prefix);
-diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc
-index 08116b3ab53..76f59844312 100644
---- a/src/core/lib/iomgr/ev_epollex_linux.cc
-+++ b/src/core/lib/iomgr/ev_epollex_linux.cc
-@@ -1102,7 +1102,7 @@ static void end_worker(grpc_pollset* pollset, grpc_pollset_worker* worker,
- }
-
- #ifndef NDEBUG
--static long gettid(void) { return syscall(__NR_gettid); }
-+static long sys_gettid(void) { return syscall(__NR_gettid); }
- #endif
-
- /* pollset->mu lock must be held by the caller before calling this.
-@@ -1122,7 +1122,7 @@ static grpc_error* pollset_work(grpc_pollset* pollset,
- #define WORKER_PTR (&worker)
- #endif
- #ifndef NDEBUG
-- WORKER_PTR->originator = gettid();
-+ WORKER_PTR->originator = sys_gettid();
- #endif
- if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
- gpr_log(GPR_INFO,
diff --git a/dev-python/grpcio/grpcio-1.22.1.ebuild b/dev-python/grpcio/grpcio-1.22.1.ebuild
deleted file mode 100644
index 122183c4593..00000000000
--- a/dev-python/grpcio/grpcio-1.22.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- net-dns/c-ares:=
- !<net-libs/grpc-1.16.0[python]
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
-
-python_configure_all() {
- 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_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.23.0.ebuild b/dev-python/grpcio/grpcio-1.23.0.ebuild
deleted file mode 100644
index 122183c4593..00000000000
--- a/dev-python/grpcio/grpcio-1.23.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- net-dns/c-ares:=
- !<net-libs/grpc-1.16.0[python]
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-PATCHES=( "${FILESDIR}/grpc-1.22.1-glibc-2.30-compat.patch" )
-
-python_configure_all() {
- 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_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
diff --git a/dev-python/grpcio/grpcio-1.24.3.ebuild b/dev-python/grpcio/grpcio-1.24.3.ebuild
deleted file mode 100644
index 0d4dc181f6d..00000000000
--- a/dev-python/grpcio/grpcio-1.24.3.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND=">=dev-libs/openssl-1.0.2:0=[-bindist]
- >=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
- dev-python/protobuf-python[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- net-dns/c-ares:=
- !<net-libs/grpc-1.16.0[python]
- sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-python_configure_all() {
- 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_ZLIB=1
- export GRPC_PYTHON_BUILD_WITH_CYTHON=1
- export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/
@ 2020-06-08 7:05 Georgy Yakovlev
0 siblings, 0 replies; 6+ messages in thread
From: Georgy Yakovlev @ 2020-06-08 7:05 UTC (permalink / raw
To: gentoo-commits
commit: 4e00d0a56ca1dd9be9d99a3d80a12d2f0b6b1cfc
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 8 06:56:16 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jun 8 07:04:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e00d0a5
dev-python/grpcio: respect CC in setup.py
Upstream-PR: https://github.com/grpc/grpc/pull/23159
Bug: https://bugs.gentoo.org/727478
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-python/grpcio/files/setup.py-respect-cc.patch | 33 +++++++++++++++++++++++
dev-python/grpcio/grpcio-1.28.1.ebuild | 2 ++
2 files changed, 35 insertions(+)
diff --git a/dev-python/grpcio/files/setup.py-respect-cc.patch b/dev-python/grpcio/files/setup.py-respect-cc.patch
new file mode 100644
index 00000000000..545346e8152
--- /dev/null
+++ b/dev-python/grpcio/files/setup.py-respect-cc.patch
@@ -0,0 +1,33 @@
+From 0a6c58fc0161e697bbf64b4f3d4ef14b03ac186b Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Sun, 7 Jun 2020 23:35:31 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+some configurations do not provide generic cc binary.
+while rest of the build calls CHOST prefixed binaries,
+this check fails. fix it.
+
+Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 2379703eb7..0f92270607 100644
+--- a/setup.py
++++ b/setup.py
+@@ -144,9 +144,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+
+ def check_linker_need_libatomic():
+ """Test if linker on system needs libatomic."""
++ cc = os.environ.get('CC', 'cc')
+ code_test = (b'#include <atomic>\n' +
+ b'int main() { return std::atomic<int64_t>{}; }')
+- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++ cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+ stdin=PIPE,
+ stdout=PIPE,
+ stderr=PIPE)
+--
+2.27.0
+
diff --git a/dev-python/grpcio/grpcio-1.28.1.ebuild b/dev-python/grpcio/grpcio-1.28.1.ebuild
index 8fd8e8b73c1..52d65ba9345 100644
--- a/dev-python/grpcio/grpcio-1.28.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.28.1.ebuild
@@ -25,6 +25,8 @@ DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]
"
+PATCHES=( "${FILESDIR}/setup.py-respect-cc.patch" )
+
python_configure_all() {
export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/
@ 2020-09-25 22:55 Georgy Yakovlev
0 siblings, 0 replies; 6+ messages in thread
From: Georgy Yakovlev @ 2020-09-25 22:55 UTC (permalink / raw
To: gentoo-commits
commit: 31fe4f98334024bbb8f99fc16c75ac442f179a22
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 25 22:36:55 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep 25 22:55:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31fe4f98
dev-python/grpcio: bump to 1.32.0
Bug: https://bugs.gentoo.org/744619
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
dev-python/grpcio/Manifest | 1 +
...up.py-respect-CC-variable-in-latomic-test.patch | 28 ++++++++++++++
dev-python/grpcio/grpcio-1.32.0.ebuild | 43 ++++++++++++++++++++++
3 files changed, 72 insertions(+)
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 8103d8c7204..8b912edf166 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1 +1,2 @@
DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
+DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
diff --git a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
new file mode 100644
index 00000000000..c6729e9808b
--- /dev/null
+++ b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
@@ -0,0 +1,28 @@
+From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:34:19 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 20a6d76..d1cd707 100644
+--- a/setup.py
++++ b/setup.py
+@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+
+ def check_linker_need_libatomic():
+ """Test if linker on system needs libatomic."""
++ cc = os.environ.get('CC', 'cc')
+ code_test = (b'#include <atomic>\n' +
+ b'int main() { return std::atomic<int64_t>{}; }')
+- cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++ cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+ stdin=PIPE,
+ stdout=PIPE,
+ stderr=PIPE)
+--
+2.28.0
+
diff --git a/dev-python/grpcio/grpcio-1.32.0.ebuild b/dev-python/grpcio/grpcio-1.32.0.ebuild
new file mode 100644
index 00000000000..d5fdc2f0f42
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.32.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 multiprocessing prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+ >=dev-libs/openssl-1.0.2:0=[-bindist]
+ >=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+ dev-python/protobuf-python[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ net-dns/c-ares:=
+ sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
+
+python_prepare_all() {
+ distutils-r1_python_prepare_all
+ hprefixify setup.py
+}
+
+python_configure_all() {
+ 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_ZLIB=1
+ export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+ export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/
@ 2023-01-05 11:55 Michał Górny
0 siblings, 0 replies; 6+ messages in thread
From: Michał Górny @ 2023-01-05 11:55 UTC (permalink / raw
To: gentoo-commits
commit: d885c407033f0f19ef7f27a927cccb489e5f47f7
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 5 11:55:22 2023 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 5 11:55:22 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d885c407
dev-python/grpcio: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/grpcio/Manifest | 1 -
.../grpcio/files/1.37.1-cc-flag-test-fix.patch | 26 ------------
dev-python/grpcio/grpcio-1.43.0-r1.ebuild | 47 ----------------------
3 files changed, 74 deletions(-)
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index cc25dda8f5e2..698e5d88b4e3 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,2 +1 @@
-DIST grpcio-1.43.0.tar.gz 21461955 BLAKE2B 406a341d24bf418a006b3f86c25254f3bb3981fd20123fd2d99d53d73e04b8da5500b7d871d8e3d96d1167a1306fd66a05cff418d1af8ff3eba9bb3faa34a199 SHA512 c4e9c7d20e53653c014d3c301f572df26ae84beb8d04fc3d763afcb695d232416ed8e7822f93bed1f9d8aab44f08aaaf36bf2f05aaa6bc3607428efbc0775cb1
DIST grpcio-1.51.0.tar.gz 22142437 BLAKE2B 20acb52c89e41cd6e87ddb5554bcf79acc6fa18f4516c7be7a3fa1408ecb1e5800d6123bd7ac561093ca341344618de9701c3df75251e96cd9da5a3443568303 SHA512 3560e07df79143cb7a8a0a1f0dbaba2d164962ba712adf030a60654102bbd5ce6a08f88c133b81a3e471f1ec3d63de14f1b0567aa45bd641d958d3349ccef542
diff --git a/dev-python/grpcio/files/1.37.1-cc-flag-test-fix.patch b/dev-python/grpcio/files/1.37.1-cc-flag-test-fix.patch
deleted file mode 100644
index 0869c57dd113..000000000000
--- a/dev-python/grpcio/files/1.37.1-cc-flag-test-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c21ddf679bf46c0a13046060f17d7a87608923e3 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Mon, 14 Jun 2021 19:38:37 -0700
-Subject: [PATCH] fix cc flag test
-
----
- 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 df8fc46..de71ea5 100644
---- a/src/python/grpcio/commands.py
-+++ b/src/python/grpcio/commands.py
-@@ -234,7 +234,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++11', '-'],
-+ cc = os.environ.get('CC', 'cc')
-+ cc_test = subprocess.Popen([cc, '-x', 'c', '-std=c++11', '-'],
- stdin=subprocess.PIPE,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE)
---
-2.32.0
-
diff --git a/dev-python/grpcio/grpcio-1.43.0-r1.ebuild b/dev-python/grpcio/grpcio-1.43.0-r1.ebuild
deleted file mode 100644
index e27ff7b932cd..000000000000
--- a/dev-python/grpcio/grpcio-1.43.0-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 multiprocessing prefix
-
-DESCRIPTION="High-performance RPC framework (python libraries)"
-HOMEPAGE="https://grpc.io"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-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/cython-0.28.3[${PYTHON_USEDEP}]
- <dev-python/protobuf-python-4[${PYTHON_USEDEP}]
- dev-python/six[${PYTHON_USEDEP}]
- net-dns/c-ares:=
- sys-libs/zlib:=
-"
-
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/1.37.1-cc-flag-test-fix.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)"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-01-05 11:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-17 3:00 [gentoo-commits] repo/gentoo:master commit in: dev-python/grpcio/files/, dev-python/grpcio/ Georgy Yakovlev
-- strict thread matches above, loose matches on Subject: below --
2020-01-17 10:22 Georgy Yakovlev
2020-03-27 10:42 Michał Górny
2020-06-08 7:05 Georgy Yakovlev
2020-09-25 22:55 Georgy Yakovlev
2023-01-05 11:55 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox