diff options
Diffstat (limited to 'net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch')
-rw-r--r-- | net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch new file mode 100644 index 000000000000..c2e20f3994f4 --- /dev/null +++ b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch @@ -0,0 +1,52 @@ +From 78a6e04ec1efc2dc839f0329dcff732940e27fd9 Mon Sep 17 00:00:00 2001 +From: Thomas Bechtold <tbechtold@suse.com> +Date: Fri, 25 May 2018 07:08:05 +0200 +Subject: [PATCH] Allow building the python module with system cares + +When building the python module and using the new +GRPC_PYTHON_BUILD_SYSTEM_CARES env variable, the third party cares code +is not compiled. Instead, the cares shared library installed on the +system is used during runtime. +This is useful for distributions who don't want to include code copies +but use shared libraries instead. +--- + setup.py | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/setup.py b/setup.py +index 483d3ac1682..43c25aafeb9 100644 +--- a/setup.py ++++ b/setup.py +@@ -96,6 +96,12 @@ + BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB', + False) + ++# Export this variable to use the system installation of cares. You need to ++# have the header files installed (in /usr/include/) and during ++# runtime, the shared libary must be installed ++BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES', ++ False) ++ + # Environment variable to determine whether or not to enable coverage analysis + # in Cython modules. + ENABLE_CYTHON_TRACING = os.environ.get( +@@ -169,6 +175,10 @@ + CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES) + ZLIB_INCLUDE = (os.path.join('/usr', 'include'),) + ++if BUILD_WITH_SYSTEM_CARES: ++ CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES) ++ CARES_INCLUDE = (os.path.join('/usr', 'include'),) ++ + EXTENSION_INCLUDE_DIRECTORIES = ( + (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE + + CARES_INCLUDE + ADDRESS_SORTING_INCLUDE) +@@ -184,6 +194,8 @@ + EXTENSION_LIBRARIES += ('ssl', 'crypto',) + if BUILD_WITH_SYSTEM_ZLIB: + EXTENSION_LIBRARIES += ('z',) ++if BUILD_WITH_SYSTEM_CARES: ++ EXTENSION_LIBRARIES += ('cares',) + + DEFINE_MACROS = ( + ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600), |