]>
Commit | Line | Data |
---|---|---|
824ee0e2 JR |
1 | diff -urNp -x '*.orig' grpc-1.32.0.org/setup.py grpc-1.32.0/setup.py |
2 | --- grpc-1.32.0.org/setup.py 2020-09-08 23:00:06.000000000 +0200 | |
3 | +++ grpc-1.32.0/setup.py 2021-03-04 23:29:26.600732792 +0100 | |
4 | @@ -132,6 +132,8 @@ BUILD_WITH_SYSTEM_ZLIB = os.environ.get( | |
53fc12f4 JR |
5 | BUILD_WITH_SYSTEM_CARES = _env_bool_value('GRPC_PYTHON_BUILD_SYSTEM_CARES', |
6 | 'False') | |
f872612c JB |
7 | |
8 | +BUILD_WITH_SYSTEM_ABSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ABSL', False) | |
9 | + | |
53fc12f4 JR |
10 | # Export this variable to use the system installation of re2. You need to |
11 | # have the header files installed (in /usr/include/re2) and during | |
12 | # runtime, the shared library must be installed | |
824ee0e2 | 13 | @@ -246,6 +248,10 @@ if BUILD_WITH_SYSTEM_CARES: |
f872612c JB |
14 | CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES) |
15 | CARES_INCLUDE = (os.path.join('/usr', 'include'),) | |
16 | ||
17 | +if BUILD_WITH_SYSTEM_ABSL: | |
18 | + CORE_C_FILES = filter(lambda x: 'third_party/abseil-cpp' not in x, CORE_C_FILES) | |
19 | + ABSL_INCLUDE = (os.path.join('/usr', 'include'),) | |
20 | + | |
53fc12f4 JR |
21 | if BUILD_WITH_SYSTEM_RE2: |
22 | CORE_C_FILES = filter(lambda x: 'third_party/re2' not in x, CORE_C_FILES) | |
23 | RE2_INCLUDE = (os.path.join('/usr', 'include', 're2'),) | |
24 | @@ -272,6 +278,12 @@ if BUILD_WITH_SYSTEM_ZLIB: | |
d528a95f | 25 | EXTENSION_LIBRARIES += ('cares',) |
53fc12f4 JR |
26 | if BUILD_WITH_SYSTEM_RE2: |
27 | EXTENSION_LIBRARIES += ('re2',) | |
d528a95f | 28 | +if BUILD_WITH_SYSTEM_ABSL: |
53fc12f4 JR |
29 | + EXTENSION_LIBRARIES += ('absl_bad_optional_access', 'absl_bad_variant_access', 'absl_base','absl_city', |
30 | + 'absl_civil_time', 'absl_cord', 'absl_debugging_internal', 'absl_demangle_internal', | |
31 | + 'absl_exponential_biased', 'absl_graphcycles_internal', 'absl_hash', 'absl_hashtablez_sampler', | |
32 | + 'absl_int128', 'absl_log_severity', 'absl_malloc_internal', 'absl_raw_hash_set', | |
33 | + 'absl_raw_logging_internal', 'absl_spinlock_wait', 'absl_stacktrace', 'absl_status') | |
d528a95f JB |
34 | |
35 | DEFINE_MACROS = (('_WIN32_WINNT', 0x600),) | |
36 | asm_files = [] | |
a1ffe626 JB |
37 | --- grpc-1.43.0/CMakeLists.txt.orig 2022-02-16 18:44:09.497196632 +0100 |
38 | +++ grpc-1.43.0/CMakeLists.txt 2022-02-16 18:47:09.636220735 +0100 | |
39 | @@ -99,21 +99,11 @@ set(gRPC_ABSL_PROVIDER "module" CACHE ST | |
53fc12f4 JR |
40 | set_property(CACHE gRPC_ABSL_PROVIDER PROPERTY STRINGS "module" "package") |
41 | ||
42 | set(gRPC_ABSL_USED_TARGETS | |
43 | - absl_algorithm | |
44 | - absl_algorithm_container | |
45 | - absl_atomic_hook | |
46 | absl_bad_optional_access | |
47 | absl_bad_variant_access | |
48 | absl_base | |
49 | - absl_base_internal | |
50 | - absl_bind_front | |
51 | - absl_bits | |
52 | absl_city | |
53 | absl_civil_time | |
54 | - absl_compressed_tuple | |
55 | - absl_config | |
56 | - absl_container_common | |
57 | - absl_container_memory | |
58 | absl_cord | |
a1ffe626 JB |
59 | absl_cord_internal |
60 | absl_cordz_functions | |
61 | @@ -122,39 +112,19 @@ set(gRPC_ABSL_USED_TARGETS | |
62 | absl_cordz_statistics | |
63 | absl_cordz_update_scope | |
64 | absl_cordz_update_tracker | |
53fc12f4 JR |
65 | - absl_core_headers |
66 | absl_debugging_internal | |
67 | absl_demangle_internal | |
68 | - absl_dynamic_annotations | |
69 | - absl_endian | |
70 | - absl_errno_saver | |
71 | absl_exponential_biased | |
72 | - absl_fixed_array | |
73 | - absl_flat_hash_map | |
74 | - absl_function_ref | |
75 | absl_graphcycles_internal | |
76 | absl_hash | |
77 | - absl_hash_function_defaults | |
78 | - absl_hash_policy_traits | |
79 | - absl_hashtable_debug_hooks | |
80 | absl_hashtablez_sampler | |
81 | - absl_have_sse | |
82 | - absl_inlined_vector | |
83 | - absl_inlined_vector_internal | |
84 | absl_int128 | |
85 | - absl_kernel_timeout_internal | |
86 | - absl_layout | |
87 | absl_log_severity | |
a1ffe626 | 88 | absl_low_level_hash |
53fc12f4 JR |
89 | absl_malloc_internal |
90 | - absl_memory | |
91 | - absl_numeric_representation | |
92 | - absl_optional | |
93 | - absl_raw_hash_map | |
94 | absl_raw_hash_set | |
95 | absl_raw_logging_internal | |
a1ffe626 | 96 | absl_sample_recorder |
53fc12f4 JR |
97 | - absl_span |
98 | absl_spinlock_wait | |
99 | absl_stacktrace | |
100 | absl_status |