Received: by mail.netbsd.org (Postfix, from userid 605) id E97D384D95; Fri, 19 Apr 2019 09:58:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 70E3984D88 for ; Fri, 19 Apr 2019 09:58:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id SseLjFNItrWi for ; Fri, 19 Apr 2019 09:58:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A4E1784D44 for ; Fri, 19 Apr 2019 09:58:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9EFEBFB16; Fri, 19 Apr 2019 09:58:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1555667930179550" MIME-Version: 1.0 Date: Fri, 19 Apr 2019 09:58:50 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/net/py-grpcio-tools To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20190419095850.9EFEBFB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1555667930179550 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Fri Apr 19 09:58:50 UTC 2019 Modified Files: pkgsrc/net/py-grpcio-tools: Makefile distinfo pkgsrc/net/py-grpcio-tools/patches: patch-setup.py Log Message: py-grpcio-tools: updated to 1.20.0 1.20.0: Sync with grpc 1.20.0 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-grpcio-tools/Makefile \ pkgsrc/net/py-grpcio-tools/distinfo cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/py-grpcio-tools/patches/patch-setup.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1555667930179550 Content-Disposition: inline Content-Length: 5167 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/py-grpcio-tools/Makefile diff -u pkgsrc/net/py-grpcio-tools/Makefile:1.1 pkgsrc/net/py-grpcio-tools/Makefile:1.2 --- pkgsrc/net/py-grpcio-tools/Makefile:1.1 Sat Apr 28 01:24:36 2018 +++ pkgsrc/net/py-grpcio-tools/Makefile Fri Apr 19 09:58:50 2019 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2018/04/28 01:24:36 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2019/04/19 09:58:50 adam Exp $ -DISTNAME= grpcio-tools-1.11.0 +DISTNAME= grpcio-tools-1.20.0 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= net python MASTER_SITES= ${MASTER_SITE_PYPI:=g/grpcio-tools/} @@ -10,11 +10,14 @@ HOMEPAGE= https://grpc.io/ COMMENT= Protobuf code generator for gRPC LICENSE= apache-2.0 -DEPENDS+= ${PYPKGPREFIX}-grpcio>=1.11.0:../../net/py-grpcio -DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.5.0:../../devel/py-protobuf +DEPENDS+= ${PYPKGPREFIX}-grpcio>=1.20.0:../../net/py-grpcio +DEPENDS+= ${PYPKGPREFIX}-protobuf>=3.5.1:../../devel/py-protobuf USE_LANGUAGES= c c++11 +MAKE_ENV+= GRPC_PYTHON_LDFLAGS="-lprotoc ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.protobuf}/lib" + +.include "../../devel/protobuf/buildlink3.mk" .include "../../lang/python/egg.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/net/py-grpcio-tools/distinfo diff -u pkgsrc/net/py-grpcio-tools/distinfo:1.1 pkgsrc/net/py-grpcio-tools/distinfo:1.2 --- pkgsrc/net/py-grpcio-tools/distinfo:1.1 Sat Apr 28 01:24:36 2018 +++ pkgsrc/net/py-grpcio-tools/distinfo Fri Apr 19 09:58:50 2019 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1 2018/04/28 01:24:36 minskim Exp $ +$NetBSD: distinfo,v 1.2 2019/04/19 09:58:50 adam Exp $ -SHA1 (grpcio-tools-1.11.0.tar.gz) = 0f1122e10a451514b6da470a68c3144a55c306de -RMD160 (grpcio-tools-1.11.0.tar.gz) = 0b2dae30de1df63e0204e3e21d7f4ac883ff0ad4 -SHA512 (grpcio-tools-1.11.0.tar.gz) = e22ac471344d38f25b8bf59e358dc193f6fc19d496e74548e2ccf4fa9809ed6a756c2d3cd998fb026a7164e0271e1955332d29ba42b30b4a5fc998fb7c81662b -Size (grpcio-tools-1.11.0.tar.gz) = 1917055 bytes -SHA1 (patch-setup.py) = ead9b166fe5f2404f894bc2240141a694afd42f2 +SHA1 (grpcio-tools-1.20.0.tar.gz) = 0566ab94bea974e5acd709d04ef07df561905457 +RMD160 (grpcio-tools-1.20.0.tar.gz) = 56e9d9936285f06703e9c06ef99243ffec173f33 +SHA512 (grpcio-tools-1.20.0.tar.gz) = b03b442fa5dc239919423e7eed5d6865924a4bc9369defc688b5ce72eb2b00580f9fb7a52a8a05cb255aee03000e9379dd7e8dae4a441811622e015d25792c0c +Size (grpcio-tools-1.20.0.tar.gz) = 2019822 bytes +SHA1 (patch-setup.py) = ac7c9fbcd9f33a8824c18834bea9c4262f65f718 Index: pkgsrc/net/py-grpcio-tools/patches/patch-setup.py diff -u pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.1 pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.2 --- pkgsrc/net/py-grpcio-tools/patches/patch-setup.py:1.1 Sat Apr 28 13:57:05 2018 +++ pkgsrc/net/py-grpcio-tools/patches/patch-setup.py Fri Apr 19 09:58:50 2019 @@ -1,10 +1,11 @@ -$NetBSD: patch-setup.py,v 1.1 2018/04/28 13:57:05 minskim Exp $ +$NetBSD: patch-setup.py,v 1.2 2019/04/19 09:58:50 adam Exp $ Use pthread on FreeBSD. +Use external protobuf. ---- setup.py.orig 2018-04-13 19:56:09.000000000 +0000 +--- setup.py.orig 2019-04-15 23:12:52.000000000 +0000 +++ setup.py -@@ -85,7 +85,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: +@@ -88,7 +88,7 @@ if EXTRA_ENV_COMPILE_ARGS is None: EXTRA_ENV_COMPILE_ARGS += ' -fno-wrapv -frtti' if EXTRA_ENV_LINK_ARGS is None: EXTRA_ENV_LINK_ARGS = '' @@ -13,7 +14,19 @@ Use pthread on FreeBSD. EXTRA_ENV_LINK_ARGS += ' -lpthread' elif "win32" in sys.platform and sys.version_info < (3, 5): msvcr = cygwinccompiler.get_msvcr()[0] -@@ -113,7 +113,7 @@ if "win32" in sys.platform: +@@ -101,11 +101,9 @@ if EXTRA_ENV_LINK_ARGS is None: + EXTRA_COMPILE_ARGS = shlex.split(EXTRA_ENV_COMPILE_ARGS) + EXTRA_LINK_ARGS = shlex.split(EXTRA_ENV_LINK_ARGS) + +-CC_FILES = [os.path.normpath(cc_file) for cc_file in protoc_lib_deps.CC_FILES] + PROTO_FILES = [ + os.path.normpath(proto_file) for proto_file in protoc_lib_deps.PROTO_FILES + ] +-CC_INCLUDE = os.path.normpath(protoc_lib_deps.CC_INCLUDE) + PROTO_INCLUDE = os.path.normpath(protoc_lib_deps.PROTO_INCLUDE) + + GRPC_PYTHON_TOOLS_PACKAGE = 'grpc_tools' +@@ -116,7 +114,7 @@ if "win32" in sys.platform: DEFINE_MACROS += (('WIN32_LEAN_AND_MEAN', 1),) if '64bit' in platform.architecture()[0]: DEFINE_MACROS += (('MS_WIN64', 1),) @@ -22,3 +35,20 @@ Use pthread on FreeBSD. DEFINE_MACROS += (('HAVE_PTHREAD', 1),) # By default, Python3 distutils enforces compatibility of +@@ -163,7 +161,7 @@ def extension_modules(): + plugin_sources += [ + os.path.join('grpc_tools', 'main.cc'), + os.path.join('grpc_root', 'src', 'compiler', 'python_generator.cc') +- ] + [os.path.join(CC_INCLUDE, cc_file) for cc_file in CC_FILES] ++ ] + + plugin_ext = extension.Extension( + name='grpc_tools._protoc_compiler', +@@ -172,7 +170,6 @@ def extension_modules(): + '.', + 'grpc_root', + os.path.join('grpc_root', 'include'), +- CC_INCLUDE, + ], + language='c++', + define_macros=list(DEFINE_MACROS), --_----------=_1555667930179550--