summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2020-01-17 02:18:03 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2020-01-17 02:20:12 -0800
commitf5caa3775e78ca9e2501ab818692f5c22c31e46f (patch)
tree7f0aa38a7040a28379b52edca7c4499a2447c5d4
parentdev-python/grpcio-testing: drop 1.25.0 (diff)
downloadgentoo-f5caa3775e78ca9e2501ab818692f5c22c31e46f.tar.gz
gentoo-f5caa3775e78ca9e2501ab818692f5c22c31e46f.tar.bz2
gentoo-f5caa3775e78ca9e2501ab818692f5c22c31e46f.zip
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@gentoo.org>
-rw-r--r--dev-python/grpcio/files/grpc-1.26-fix-odr-violation.patch421
-rw-r--r--dev-python/grpcio/grpcio-1.26.0-r1.ebuild (renamed from dev-python/grpcio/grpcio-1.26.0.ebuild)2
2 files changed, 423 insertions, 0 deletions
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
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