grpc py-grpcio py-grpcio-testing py-grpcio-tools: updated to 1.32.0

Release v1.32.0
This release contains refinements, improvements, and bug fixes, with highlights listed below.

Core
Remove stream from stalled lists on remove_stream.
Do not cancel RPC if send metadata size if larger than peer's limit.
Don't consider receiving non-OK status as an error for HTTP2.
Keepalive throttling.
Include the target_uri in "target uri is not valid" error messages.
Fix "cannot send compressed message large than 1024B" in cronet_transport.
Receive SETTINGS frame on clients before declaring subchannel READY.
Enabled GPR_ABSEIL_SYNC.
Experimental xDS v3 support.

C++
Upgrade bazel used for all tests to 2.2.0.
Remove test targets and test helper libraries from Makefile.
Fix repeated builds broken by re2's cmake.
Log the peer address of grpc_cli CallMethod RPCs to stderr.

Python
[gRPC Easy] GA: This release enables runtime import of .proto Files. (gRFC, PR) Together with support for simple stubs present since 1.29, this completes gRPC Easy. To start using these features, take a look at the example. If using simple stubs without runtime proto import, generated code must be regenerated with an up-to-date version of the grpcio-tools package.
[Aio] Graduation from experimental folder.
[Aio] Prevent call objects from outliving its parent channel or server.
[Aio] Add a fail-back polling mode for Windows+3.8+.
Raises an exception when port binding failed.
Implement compute_engine_channel_credentials in Python.
Fix bazel out directory when using external repo.

11 files changed, 89 insertions, 92 deletions

diff --git a/net/grpc/Makefile b/net/grpc/Makefile
index 0ac8f9d110f..3ccae8c4b4a 100644
--- a/net/grpc/Makefile
+++ b/net/grpc/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2020/08/24 08:17:04 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2020/09/10 07:18:33 adam Exp $
 
-DISTNAME=	grpc-1.31.1
+DISTNAME=	grpc-1.32.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=grpc/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/net/grpc/PLIST b/net/grpc/PLIST
index 20648d34518..0efb3da8f56 100644
--- a/net/grpc/PLIST
+++ b/net/grpc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2020/08/07 06:45:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2020/09/10 07:18:33 adam Exp $
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
@@ -143,12 +143,9 @@ include/grpc/support/workaround_list.h
 include/grpcpp/alarm.h
 include/grpcpp/alarm_impl.h
 include/grpcpp/channel.h
-include/grpcpp/channel_impl.h
 include/grpcpp/client_context.h
 include/grpcpp/completion_queue.h
-include/grpcpp/completion_queue_impl.h
 include/grpcpp/create_channel.h
-include/grpcpp/create_channel_impl.h
 include/grpcpp/create_channel_posix.h
 include/grpcpp/ext/channelz_service_plugin.h
 include/grpcpp/ext/channelz_service_plugin_impl.h
@@ -176,11 +173,9 @@ include/grpcpp/impl/codegen/channel_interface.h
 include/grpcpp/impl/codegen/client_callback.h
 include/grpcpp/impl/codegen/client_callback_impl.h
 include/grpcpp/impl/codegen/client_context.h
-include/grpcpp/impl/codegen/client_context_impl.h
 include/grpcpp/impl/codegen/client_interceptor.h
 include/grpcpp/impl/codegen/client_unary_call.h
 include/grpcpp/impl/codegen/completion_queue.h
-include/grpcpp/impl/codegen/completion_queue_impl.h
 include/grpcpp/impl/codegen/completion_queue_tag.h
 include/grpcpp/impl/codegen/config.h
 include/grpcpp/impl/codegen/config_protobuf.h
@@ -237,9 +232,7 @@ include/grpcpp/security/alts_util.h
 include/grpcpp/security/auth_context.h
 include/grpcpp/security/auth_metadata_processor.h
 include/grpcpp/security/credentials.h
-include/grpcpp/security/credentials_impl.h
 include/grpcpp/security/server_credentials.h
-include/grpcpp/security/server_credentials_impl.h
 include/grpcpp/security/tls_credentials_options.h
 include/grpcpp/server.h
 include/grpcpp/server_builder.h
@@ -252,13 +245,11 @@ include/grpcpp/support/async_unary_call.h
 include/grpcpp/support/async_unary_call_impl.h
 include/grpcpp/support/byte_buffer.h
 include/grpcpp/support/channel_arguments.h
-include/grpcpp/support/channel_arguments_impl.h
 include/grpcpp/support/client_callback.h
 include/grpcpp/support/client_callback_impl.h
 include/grpcpp/support/client_interceptor.h
 include/grpcpp/support/config.h
 include/grpcpp/support/error_details.h
-include/grpcpp/support/error_details_impl.h
 include/grpcpp/support/interceptor.h
 include/grpcpp/support/message_allocator.h
 include/grpcpp/support/method_handler.h
@@ -282,11 +273,11 @@ lib/cmake/grpc/gRPCTargets-noconfig.cmake
 lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.11
-lib/libaddress_sorting.so.11.0.0
+lib/libaddress_sorting.so.12
+lib/libaddress_sorting.so.12.0.0
 lib/libgpr.so
-lib/libgpr.so.11
-lib/libgpr.so.11.0.0
+lib/libgpr.so.12
+lib/libgpr.so.12.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.${PKGVERSION}
 lib/libgrpc++.so.1
@@ -303,20 +294,20 @@ lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.${PKGVERSION}
 lib/libgrpc++_unsecure.so.1
 lib/libgrpc.so
-lib/libgrpc.so.11
-lib/libgrpc.so.11.0.0
+lib/libgrpc.so.12
+lib/libgrpc.so.12.0.0
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.${PKGVERSION}
 lib/libgrpc_plugin_support.so.1
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.11
-lib/libgrpc_unsecure.so.11.0.0
+lib/libgrpc_unsecure.so.12
+lib/libgrpc_unsecure.so.12.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.${PKGVERSION}
 lib/libgrpcpp_channelz.so.1
 lib/libupb.so
-lib/libupb.so.11
-lib/libupb.so.11.0.0
+lib/libupb.so.12
+lib/libupb.so.12.0.0
 lib/pkgconfig/gpr.pc
 lib/pkgconfig/grpc++.pc
 lib/pkgconfig/grpc++_unsecure.pc
diff --git a/net/grpc/distinfo b/net/grpc/distinfo
index 8b5af9d3e5a..64242a3c60b 100644
--- a/net/grpc/distinfo
+++ b/net/grpc/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.30 2020/08/24 08:17:04 wiz Exp $
+$NetBSD: distinfo,v 1.31 2020/09/10 07:18:33 adam Exp $
 
-SHA1 (grpc-1.31.1.tar.gz) = c99ef78f66a5d26925bc5a6c9756e8eeb73b8028
-RMD160 (grpc-1.31.1.tar.gz) = 0bc23c0f60a448a9509a4491eebc4f4c7ffb6b05
-SHA512 (grpc-1.31.1.tar.gz) = a4ac3801b65707b4cbdc50d0ded81f1e6546df7b8135700a8d97c4917f0a7c6b8e2d348b1dfb36cb8627f5e5d3f06fe356e0fdec7954e8a2af87ecca2c663245
-Size (grpc-1.31.1.tar.gz) = 7033282 bytes
+SHA1 (grpc-1.32.0.tar.gz) = 5c5821d40bd1c9e73992867c260421b7b539fa7d
+RMD160 (grpc-1.32.0.tar.gz) = a80e022f024db2ec8bd378a9b7ec1195d0e4eca8
+SHA512 (grpc-1.32.0.tar.gz) = 90136042327cea4e3680e19484f23cc00322914a7aae7987bf00b6e0901721d14c487555fdd94888192d6beb950172361ac57fbd02d43b40552f7ff5cac442ed
+Size (grpc-1.32.0.tar.gz) = 7174251 bytes
 SHA1 (patch-CMakeLists.txt) = af17a03bdbb2b7905ced111b3c13c80b0cf3fec2
 SHA1 (patch-cmake_benchmark.cmake) = 6a7880c30019a723a35b56b0c5bd2d730b36550d
 SHA1 (patch-include_grpc_impl_codegen_port__platform.h) = b8d07e5bbf04694df00d0d19884844b791eb002c
diff --git a/net/py-grpcio-testing/Makefile b/net/py-grpcio-testing/Makefile
index 723da766240..fd63606ec04 100644
--- a/net/py-grpcio-testing/Makefile
+++ b/net/py-grpcio-testing/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2020/08/07 06:45:58 adam Exp $
+# $NetBSD: Makefile,v 1.9 2020/09/10 07:18:34 adam Exp $
 
-DISTNAME=	grpcio-testing-1.31.0
+DISTNAME=	grpcio-testing-1.32.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio-testing/}
diff --git a/net/py-grpcio-testing/distinfo b/net/py-grpcio-testing/distinfo
index e01b0c89e33..0b2ca2986e8 100644
--- a/net/py-grpcio-testing/distinfo
+++ b/net/py-grpcio-testing/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2020/08/07 06:45:58 adam Exp $
+$NetBSD: distinfo,v 1.8 2020/09/10 07:18:34 adam Exp $
 
-SHA1 (grpcio-testing-1.31.0.tar.gz) = da20736868decb1c63e4b0574e594edf983e58d1
-RMD160 (grpcio-testing-1.31.0.tar.gz) = 24751c9676486be669ef09e7896ed77ce4bbd1ed
-SHA512 (grpcio-testing-1.31.0.tar.gz) = 8691686f6de541edd532ea9f524bfd27a510a3f2514a0ad78c05a33fa70da3bfd75294039c1690d799ed096beb035a1325a9c51ca6dc2da8fa2103f700cebfd2
-Size (grpcio-testing-1.31.0.tar.gz) = 16477 bytes
+SHA1 (grpcio-testing-1.32.0.tar.gz) = cd93e31d3d6798e109b7087cea16f35398446b52
+RMD160 (grpcio-testing-1.32.0.tar.gz) = 61b29392d34e0ba90f11b33b94de1a2928f90396
+SHA512 (grpcio-testing-1.32.0.tar.gz) = 3ee10912a090287d3f039f350b11b8fc2ed656939e02a3e616911fd1af838e3f3570a7b3444c0ef54a25797a61edde87d545a9b9cabaf251a862b94100a45473
+Size (grpcio-testing-1.32.0.tar.gz) = 16814 bytes
diff --git a/net/py-grpcio-tools/Makefile b/net/py-grpcio-tools/Makefile
index b4f64925dbd..ab80c7c1b9f 100644
--- a/net/py-grpcio-tools/Makefile
+++ b/net/py-grpcio-tools/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2020/08/07 06:45:58 adam Exp $
+# $NetBSD: Makefile,v 1.19 2020/09/10 07:18:34 adam Exp $
 
-DISTNAME=	grpcio-tools-1.31.0
+DISTNAME=	grpcio-tools-1.32.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio-tools/}
diff --git a/net/py-grpcio-tools/distinfo b/net/py-grpcio-tools/distinfo
index 388a3b204e2..2e8d1f21260 100644
--- a/net/py-grpcio-tools/distinfo
+++ b/net/py-grpcio-tools/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2020/08/07 06:45:58 adam Exp $
+$NetBSD: distinfo,v 1.17 2020/09/10 07:18:34 adam Exp $
 
-SHA1 (grpcio-tools-1.31.0.tar.gz) = 7fca6f8f306e62674a4380865722ebf9e448d34d
-RMD160 (grpcio-tools-1.31.0.tar.gz) = 0a7e8f2ced620339c3f5e402f8301534f09f28bb
-SHA512 (grpcio-tools-1.31.0.tar.gz) = 08a362b9f1a4f5e78f70020ed7fce596ff7836085c0a3d4d1886415e9b70532ad77bf2f7f329df237f5e2a9cb55774827268da9cd3be8a766ae9277b6b1e7aa1
-Size (grpcio-tools-1.31.0.tar.gz) = 2065294 bytes
+SHA1 (grpcio-tools-1.32.0.tar.gz) = d3ec09e2b698cc7f38a42927bc3ba76079a8f6ce
+RMD160 (grpcio-tools-1.32.0.tar.gz) = 96dcf904437cb0f00441343ca2f5b8274c13f4a7
+SHA512 (grpcio-tools-1.32.0.tar.gz) = aad072eb6de60d162d4ed6e353ced9d1b7d72e4ffd012237294fc5839c7d411dc640ea235746057007d289ee37235aa93c8ac23108299ab150c24f99cf050a4a
+Size (grpcio-tools-1.32.0.tar.gz) = 2103777 bytes
 SHA1 (patch-setup.py) = 080ba75a31b51631000e79006316e0a2d5ce6cee
diff --git a/net/py-grpcio/Makefile b/net/py-grpcio/Makefile
index a0b797c54a8..8a41ca662be 100644
--- a/net/py-grpcio/Makefile
+++ b/net/py-grpcio/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2020/08/07 06:45:57 adam Exp $
+# $NetBSD: Makefile,v 1.21 2020/09/10 07:18:33 adam Exp $
 
-DISTNAME=	grpcio-1.31.0
+DISTNAME=	grpcio-1.32.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	net python
 MASTER_SITES=	${MASTER_SITE_PYPI:=g/grpcio/}
@@ -10,7 +10,6 @@ HOMEPAGE=	https://grpc.io/
 COMMENT=	HTTP/2-based RPC framework
 LICENSE=	apache-2.0
 
-DEPENDS+=	${PYPKGPREFIX}-protobuf>=3.5.0:../../devel/py-protobuf
 DEPENDS+=	${PYPKGPREFIX}-six>=1.5.2:../../lang/py-six
 
 PYTHON_VERSIONS_INCOMPATIBLE=	27
diff --git a/net/py-grpcio/PLIST b/net/py-grpcio/PLIST
index 6eb3610879c..1066a487c69 100644
--- a/net/py-grpcio/PLIST
+++ b/net/py-grpcio/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2020/06/03 09:28:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2020/09/10 07:18:33 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -36,6 +36,9 @@ ${PYSITELIB}/grpc/_interceptor.pyo
 ${PYSITELIB}/grpc/_plugin_wrapping.py
 ${PYSITELIB}/grpc/_plugin_wrapping.pyc
 ${PYSITELIB}/grpc/_plugin_wrapping.pyo
+${PYSITELIB}/grpc/_runtime_protos.py
+${PYSITELIB}/grpc/_runtime_protos.pyc
+${PYSITELIB}/grpc/_runtime_protos.pyo
 ${PYSITELIB}/grpc/_server.py
 ${PYSITELIB}/grpc/_server.pyc
 ${PYSITELIB}/grpc/_server.pyo
@@ -45,6 +48,39 @@ ${PYSITELIB}/grpc/_simple_stubs.pyo
 ${PYSITELIB}/grpc/_utilities.py
 ${PYSITELIB}/grpc/_utilities.pyc
 ${PYSITELIB}/grpc/_utilities.pyo
+${PYSITELIB}/grpc/aio/__init__.py
+${PYSITELIB}/grpc/aio/__init__.pyc
+${PYSITELIB}/grpc/aio/__init__.pyo
+${PYSITELIB}/grpc/aio/_base_call.py
+${PYSITELIB}/grpc/aio/_base_call.pyc
+${PYSITELIB}/grpc/aio/_base_call.pyo
+${PYSITELIB}/grpc/aio/_base_channel.py
+${PYSITELIB}/grpc/aio/_base_channel.pyc
+${PYSITELIB}/grpc/aio/_base_channel.pyo
+${PYSITELIB}/grpc/aio/_base_server.py
+${PYSITELIB}/grpc/aio/_base_server.pyc
+${PYSITELIB}/grpc/aio/_base_server.pyo
+${PYSITELIB}/grpc/aio/_call.py
+${PYSITELIB}/grpc/aio/_call.pyc
+${PYSITELIB}/grpc/aio/_call.pyo
+${PYSITELIB}/grpc/aio/_channel.py
+${PYSITELIB}/grpc/aio/_channel.pyc
+${PYSITELIB}/grpc/aio/_channel.pyo
+${PYSITELIB}/grpc/aio/_interceptor.py
+${PYSITELIB}/grpc/aio/_interceptor.pyc
+${PYSITELIB}/grpc/aio/_interceptor.pyo
+${PYSITELIB}/grpc/aio/_metadata.py
+${PYSITELIB}/grpc/aio/_metadata.pyc
+${PYSITELIB}/grpc/aio/_metadata.pyo
+${PYSITELIB}/grpc/aio/_server.py
+${PYSITELIB}/grpc/aio/_server.pyc
+${PYSITELIB}/grpc/aio/_server.pyo
+${PYSITELIB}/grpc/aio/_typing.py
+${PYSITELIB}/grpc/aio/_typing.pyc
+${PYSITELIB}/grpc/aio/_typing.pyo
+${PYSITELIB}/grpc/aio/_utils.py
+${PYSITELIB}/grpc/aio/_utils.pyc
+${PYSITELIB}/grpc/aio/_utils.pyo
 ${PYSITELIB}/grpc/beta/__init__.py
 ${PYSITELIB}/grpc/beta/__init__.pyc
 ${PYSITELIB}/grpc/beta/__init__.pyo
@@ -72,36 +108,6 @@ ${PYSITELIB}/grpc/experimental/__init__.pyo
 ${PYSITELIB}/grpc/experimental/aio/__init__.py
 ${PYSITELIB}/grpc/experimental/aio/__init__.pyc
 ${PYSITELIB}/grpc/experimental/aio/__init__.pyo
-${PYSITELIB}/grpc/experimental/aio/_base_call.py
-${PYSITELIB}/grpc/experimental/aio/_base_call.pyc
-${PYSITELIB}/grpc/experimental/aio/_base_call.pyo
-${PYSITELIB}/grpc/experimental/aio/_base_channel.py
-${PYSITELIB}/grpc/experimental/aio/_base_channel.pyc
-${PYSITELIB}/grpc/experimental/aio/_base_channel.pyo
-${PYSITELIB}/grpc/experimental/aio/_base_server.py
-${PYSITELIB}/grpc/experimental/aio/_base_server.pyc
-${PYSITELIB}/grpc/experimental/aio/_base_server.pyo
-${PYSITELIB}/grpc/experimental/aio/_call.py
-${PYSITELIB}/grpc/experimental/aio/_call.pyc
-${PYSITELIB}/grpc/experimental/aio/_call.pyo
-${PYSITELIB}/grpc/experimental/aio/_channel.py
-${PLIST.py3x}${PYSITELIB}/grpc/experimental/aio/_channel.pyc
-${PLIST.py3x}${PYSITELIB}/grpc/experimental/aio/_channel.pyo
-${PYSITELIB}/grpc/experimental/aio/_interceptor.py
-${PYSITELIB}/grpc/experimental/aio/_interceptor.pyc
-${PYSITELIB}/grpc/experimental/aio/_interceptor.pyo
-${PYSITELIB}/grpc/experimental/aio/_metadata.py
-${PYSITELIB}/grpc/experimental/aio/_metadata.pyc
-${PYSITELIB}/grpc/experimental/aio/_metadata.pyo
-${PYSITELIB}/grpc/experimental/aio/_server.py
-${PLIST.py3x}${PYSITELIB}/grpc/experimental/aio/_server.pyc
-${PLIST.py3x}${PYSITELIB}/grpc/experimental/aio/_server.pyo
-${PYSITELIB}/grpc/experimental/aio/_typing.py
-${PYSITELIB}/grpc/experimental/aio/_typing.pyc
-${PYSITELIB}/grpc/experimental/aio/_typing.pyo
-${PYSITELIB}/grpc/experimental/aio/_utils.py
-${PYSITELIB}/grpc/experimental/aio/_utils.pyc
-${PYSITELIB}/grpc/experimental/aio/_utils.pyo
 ${PYSITELIB}/grpc/experimental/gevent.py
 ${PYSITELIB}/grpc/experimental/gevent.pyc
 ${PYSITELIB}/grpc/experimental/gevent.pyo
diff --git a/net/py-grpcio/distinfo b/net/py-grpcio/distinfo
index 3927bd6589f..91ef599e47a 100644
--- a/net/py-grpcio/distinfo
+++ b/net/py-grpcio/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2020/08/07 06:45:57 adam Exp $
+$NetBSD: distinfo,v 1.21 2020/09/10 07:18:33 adam Exp $
 
-SHA1 (grpcio-1.31.0.tar.gz) = a206c8a980a21f24df91b6cf229a9a33920e5ebf
-RMD160 (grpcio-1.31.0.tar.gz) = c99223d30d704ad51f383ee400759138cfffe1a8
-SHA512 (grpcio-1.31.0.tar.gz) = 7949a3037d71e1910f56f6950c17a6732adc7246fca7c31e42d482ca34360de3ea0dc1e9c57ac205dd98b49903e6ecc17f78223a755052f2e6103940d2c00fe7
-Size (grpcio-1.31.0.tar.gz) = 20039534 bytes
-SHA1 (patch-setup.py) = dbdd4270e2cb497032a2a1f54d606d72164c816d
+SHA1 (grpcio-1.32.0.tar.gz) = d75f61c7cb530a03dd582f2e783f842cc1a32ac5
+RMD160 (grpcio-1.32.0.tar.gz) = cf6ec81caeda32454f1fbf922b56874e6fc4f08b
+SHA512 (grpcio-1.32.0.tar.gz) = f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
+Size (grpcio-1.32.0.tar.gz) = 20809917 bytes
+SHA1 (patch-setup.py) = a581ebfd280ce306c9caac8bfecf88a86efee79b
 SHA1 (patch-src_core_lib_iomgr_port.h) = 8f088cbf22110c03a684c24c9e17ef5fc64e925a
diff --git a/net/py-grpcio/patches/patch-setup.py b/net/py-grpcio/patches/patch-setup.py
index aaab6231c64..745077cead1 100644
--- a/net/py-grpcio/patches/patch-setup.py
+++ b/net/py-grpcio/patches/patch-setup.py
@@ -1,11 +1,11 @@
-$NetBSD: patch-setup.py,v 1.8 2020/08/07 06:45:58 adam Exp $
+$NetBSD: patch-setup.py,v 1.9 2020/09/10 07:18:33 adam Exp $
 
 Fix libatomic detection.
 Use dependencies in pkgsrc.
 
---- setup.py.orig	2020-08-05 07:00:04.000000000 +0000
+--- setup.py.orig	2020-09-08 21:38:30.000000000 +0000
 +++ setup.py
-@@ -151,7 +151,7 @@ def check_linker_need_libatomic():
+@@ -166,7 +166,7 @@ def check_linker_need_libatomic():
      """Test if linker on system needs libatomic."""
      code_test = (b'#include <atomic>\n' +
                   b'int main() { return std::atomic<int64_t>{}; }')
@@ -14,9 +14,9 @@ Use dependencies in pkgsrc.
                                 stdin=PIPE,
                                 stdout=PIPE,
                                 stderr=PIPE)
-@@ -236,26 +236,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
-                                  RE2_INCLUDE + SSL_INCLUDE + UPB_INCLUDE +
-                                  UPB_GRPC_GENERATED_INCLUDE + ZLIB_INCLUDE)
+@@ -252,26 +252,7 @@ EXTENSION_INCLUDE_DIRECTORIES = ((PYTHON
+                                  UPB_GRPC_GENERATED_INCLUDE +
+                                  UPBDEFS_GRPC_GENERATED_INCLUDE + ZLIB_INCLUDE)
  
 -EXTENSION_LIBRARIES = ()
 -if "linux" in sys.platform:
@@ -40,9 +40,9 @@ Use dependencies in pkgsrc.
 -    EXTENSION_LIBRARIES += ('cares',)
 +EXTENSION_LIBRARIES = ('grpc',)
  
- DEFINE_MACROS = (('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600))
- if not DISABLE_LIBC_COMPATIBILITY:
-@@ -312,7 +293,7 @@ def cython_extensions_and_necessity():
+ DEFINE_MACROS = (('_WIN32_WINNT', 0x600),)
+ asm_files = []
+@@ -349,7 +330,7 @@ def cython_extensions_and_necessity():
      ]
      config = os.environ.get('CONFIG', 'opt')
      prefix = 'libs/' + config + '/'
@@ -51,11 +51,12 @@ Use dependencies in pkgsrc.
          extra_objects = [
              prefix + 'libares.a', prefix + 'libboringssl.a',
              prefix + 'libgpr.a', prefix + 'libgrpc.a'
-@@ -324,7 +305,7 @@ def cython_extensions_and_necessity():
+@@ -361,8 +342,7 @@ def cython_extensions_and_necessity():
      extensions = [
          _extension.Extension(
              name=module_name,
--            sources=[module_file] + list(CYTHON_HELPER_C_FILES) + core_c_files,
+-            sources=([module_file] + list(CYTHON_HELPER_C_FILES) +
+-                     core_c_files + asm_files),
 +            sources=[module_file] + list(CYTHON_HELPER_C_FILES),
              include_dirs=list(EXTENSION_INCLUDE_DIRECTORIES),
              libraries=list(EXTENSION_LIBRARIES),