From da0a59ab7242233934322af396e069acf90648d9 Mon Sep 17 00:00:00 2001 From: "Laszlo Boszormenyi (GCS)" Date: Thu, 4 Feb 2021 09:44:30 +0000 Subject: [PATCH] link with external abseil Last-Update: 2020-06-12 It's not embedded in source. Gbp-Pq: Name link_external_abseil.patch --- setup.py | 1 + src/python/grpcio/grpc_core_dependencies.py | 49 --------------------- 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/setup.py b/setup.py index f4867d93..8fac99cf 100644 --- a/setup.py +++ b/setup.py @@ -195,6 +195,7 @@ if EXTRA_ENV_LINK_ARGS is None: EXTRA_ENV_LINK_ARGS += ' -lpthread' if check_linker_need_libatomic(): EXTRA_ENV_LINK_ARGS += ' -latomic' + EXTRA_ENV_LINK_ARGS += ' -labsl_str_format_internal -labsl_time -labsl_bad_optional_access' elif "win32" in sys.platform and sys.version_info < (3, 5): msvcr = cygwinccompiler.get_msvcr()[0] EXTRA_ENV_LINK_ARGS += ( diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py index 37bed169..10c2de4f 100644 --- a/src/python/grpcio/grpc_core_dependencies.py +++ b/src/python/grpcio/grpc_core_dependencies.py @@ -472,55 +472,6 @@ CORE_SOURCE_FILES = [ 'src/core/tsi/ssl_transport_security.cc', 'src/core/tsi/transport_security.cc', 'src/core/tsi/transport_security_grpc.cc', - 'third_party/abseil-cpp/absl/base/dynamic_annotations.cc', - 'third_party/abseil-cpp/absl/base/internal/cycleclock.cc', - 'third_party/abseil-cpp/absl/base/internal/raw_logging.cc', - 'third_party/abseil-cpp/absl/base/internal/spinlock.cc', - 'third_party/abseil-cpp/absl/base/internal/spinlock_wait.cc', - 'third_party/abseil-cpp/absl/base/internal/sysinfo.cc', - 'third_party/abseil-cpp/absl/base/internal/thread_identity.cc', - 'third_party/abseil-cpp/absl/base/internal/throw_delegate.cc', - 'third_party/abseil-cpp/absl/base/internal/unscaledcycleclock.cc', - 'third_party/abseil-cpp/absl/base/log_severity.cc', - 'third_party/abseil-cpp/absl/numeric/int128.cc', - 'third_party/abseil-cpp/absl/strings/ascii.cc', - 'third_party/abseil-cpp/absl/strings/charconv.cc', - 'third_party/abseil-cpp/absl/strings/escaping.cc', - 'third_party/abseil-cpp/absl/strings/internal/charconv_bigint.cc', - 'third_party/abseil-cpp/absl/strings/internal/charconv_parse.cc', - 'third_party/abseil-cpp/absl/strings/internal/escaping.cc', - 'third_party/abseil-cpp/absl/strings/internal/memutil.cc', - 'third_party/abseil-cpp/absl/strings/internal/ostringstream.cc', - 'third_party/abseil-cpp/absl/strings/internal/str_format/arg.cc', - 'third_party/abseil-cpp/absl/strings/internal/str_format/bind.cc', - 'third_party/abseil-cpp/absl/strings/internal/str_format/extension.cc', - 'third_party/abseil-cpp/absl/strings/internal/str_format/float_conversion.cc', - 'third_party/abseil-cpp/absl/strings/internal/str_format/output.cc', - 'third_party/abseil-cpp/absl/strings/internal/str_format/parser.cc', - 'third_party/abseil-cpp/absl/strings/internal/utf8.cc', - 'third_party/abseil-cpp/absl/strings/match.cc', - 'third_party/abseil-cpp/absl/strings/numbers.cc', - 'third_party/abseil-cpp/absl/strings/str_cat.cc', - 'third_party/abseil-cpp/absl/strings/str_replace.cc', - 'third_party/abseil-cpp/absl/strings/str_split.cc', - 'third_party/abseil-cpp/absl/strings/string_view.cc', - 'third_party/abseil-cpp/absl/strings/substitute.cc', - 'third_party/abseil-cpp/absl/time/civil_time.cc', - 'third_party/abseil-cpp/absl/time/clock.cc', - 'third_party/abseil-cpp/absl/time/duration.cc', - 'third_party/abseil-cpp/absl/time/format.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/civil_time_detail.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_fixed.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_if.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_impl.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_info.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_libc.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_lookup.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_posix.cc', - 'third_party/abseil-cpp/absl/time/internal/cctz/src/zone_info_source.cc', - 'third_party/abseil-cpp/absl/time/time.cc', - 'third_party/abseil-cpp/absl/types/bad_optional_access.cc', 'third_party/address_sorting/address_sorting.c', 'third_party/address_sorting/address_sorting_posix.c', 'third_party/address_sorting/address_sorting_windows.c', -- 2.30.2