From 2c4dece02320682bfb1334359e32cd124ca70cd9 Mon Sep 17 00:00:00 2001 From: Jiuqiang Tang Date: Mon, 30 Jan 2023 09:58:26 -0800 Subject: [PATCH] Internal change PiperOrigin-RevId: 505723714 --- WORKSPACE | 11 +++++------ ...001.diff => com_google_absl_windows_patch.diff} | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) rename third_party/{com_google_absl_f863b622fe13612433fdf43f76547d5edda0c93001.diff => com_google_absl_windows_patch.diff} (59%) diff --git a/WORKSPACE b/WORKSPACE index bf5e4236b..e14473e50 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -22,21 +22,20 @@ bazel_skylib_workspace() load("@bazel_skylib//lib:versions.bzl", "versions") versions.check(minimum_bazel_version = "3.7.2") -# ABSL cpp library lts_2021_03_24, patch 2. +# ABSL cpp library lts_2023_01_25. http_archive( name = "com_google_absl", urls = [ - "https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz", + "https://github.com/abseil/abseil-cpp/archive/refs/tags/20230125.0.tar.gz", ], - # Remove after https://github.com/abseil/abseil-cpp/issues/326 is solved. patches = [ - "@//third_party:com_google_absl_f863b622fe13612433fdf43f76547d5edda0c93001.diff" + "@//third_party:com_google_absl_windows_patch.diff" ], patch_args = [ "-p1", ], - strip_prefix = "abseil-cpp-20220623.1", - sha256 = "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8" + strip_prefix = "abseil-cpp-20230125.0", + sha256 = "3ea49a7d97421b88a8c48a0de16c16048e17725c7ec0f1d3ea2683a2a75adc21" ) http_archive( diff --git a/third_party/com_google_absl_f863b622fe13612433fdf43f76547d5edda0c93001.diff b/third_party/com_google_absl_windows_patch.diff similarity index 59% rename from third_party/com_google_absl_f863b622fe13612433fdf43f76547d5edda0c93001.diff rename to third_party/com_google_absl_windows_patch.diff index e46ae9f81..a4b5b96bb 100644 --- a/third_party/com_google_absl_f863b622fe13612433fdf43f76547d5edda0c93001.diff +++ b/third_party/com_google_absl_windows_patch.diff @@ -1,17 +1,3 @@ -diff --git a/absl/time/internal/cctz/BUILD.bazel b/absl/time/internal/cctz/BUILD.bazel -index 9fceffe..e7f9d01 100644 ---- a/absl/time/internal/cctz/BUILD.bazel -+++ b/absl/time/internal/cctz/BUILD.bazel -@@ -69,8 +69,5 @@ cc_library( - "include/cctz/zone_info_source.h", - ], - linkopts = select({ -- ":osx": [ -- "-framework Foundation", -- ], - ":ios": [ - "-framework Foundation", - ], diff --git a/absl/types/compare.h b/absl/types/compare.h index 19b076e..0201004 100644 --- a/absl/types/compare.h