From 77203c940c2c1d297034d6e63358f4b8bd5b8c33 Mon Sep 17 00:00:00 2001 From: Glenn Johnson Date: Fri, 12 Nov 2021 11:14:45 -0600 Subject: py-grpcio: add re2 dependency and set paths (#27391) --- var/spack/repos/builtin/packages/py-grpcio/package.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/var/spack/repos/builtin/packages/py-grpcio/package.py b/var/spack/repos/builtin/packages/py-grpcio/package.py index 490d1b67da..6975e15b86 100644 --- a/var/spack/repos/builtin/packages/py-grpcio/package.py +++ b/var/spack/repos/builtin/packages/py-grpcio/package.py @@ -41,12 +41,14 @@ class PyGrpcio(PythonPackage): depends_on('openssl') depends_on('zlib') depends_on('c-ares') + depends_on('re2+shared') def setup_build_environment(self, env): env.set('GRPC_PYTHON_BUILD_WITH_CYTHON', True) env.set('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL', True) env.set('GRPC_PYTHON_BUILD_SYSTEM_ZLIB', True) env.set('GRPC_PYTHON_BUILD_SYSTEM_CARES', True) + env.set('GRPC_PYTHON_BUILD_SYSTEM_RE2', True) # https://github.com/grpc/grpc/pull/24449 env.set('GRPC_BUILD_WITH_BORING_SSL_ASM', '') env.set('GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS', str(make_jobs)) @@ -59,3 +61,17 @@ class PyGrpcio(PythonPackage): def patch(self): if self.spec.satisfies('%fj'): filter_file("-std=gnu99", "", "setup.py") + + # use the spack packages + filter_file(r'(\s+SSL_INCLUDE = ).*', + r"\1('{0}',)".format(self.spec['openssl'].prefix.include), + 'setup.py') + filter_file(r'(\s+ZLIB_INCLUDE = ).*', + r"\1('{0}',)".format(self.spec['zlib'].prefix.include), + 'setup.py') + filter_file(r'(\s+CARES_INCLUDE = ).*', + r"\1('{0}',)".format(self.spec['c-ares'].prefix.include), + 'setup.py') + filter_file(r'(\s+RE2_INCLUDE = ).*', + r"\1('{0}',)".format(self.spec['re2'].prefix.include), + 'setup.py') -- cgit v1.2.3-70-g09d2