From f41b5a699ba37bf4a960545e6bddfb831f5f4aab Mon Sep 17 00:00:00 2001 From: Jeremy Nimmer Date: Tue, 7 Jan 2025 16:33:45 -0800 Subject: [PATCH] [workspace] Upgrade abseil_cpp_internal to latest commit (#22411) --- .../upstream/civil_time_linkopts.patch | 22 ------------------- .../abseil_cpp_internal/repository.bzl | 5 ++--- 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 tools/workspace/abseil_cpp_internal/patches/upstream/civil_time_linkopts.patch diff --git a/tools/workspace/abseil_cpp_internal/patches/upstream/civil_time_linkopts.patch b/tools/workspace/abseil_cpp_internal/patches/upstream/civil_time_linkopts.patch deleted file mode 100644 index d775349c4b63..000000000000 --- a/tools/workspace/abseil_cpp_internal/patches/upstream/civil_time_linkopts.patch +++ /dev/null @@ -1,22 +0,0 @@ -[abseil-cpp] Add missing linkopts setting to a cctz library - -This ensures that Drake's subsequent patch_cmds script to set all -libraries to static linking will indeed find all libraries. - -Submitted upstream as https://github.com/google/cctz/pull/305 but -Google requested to implement this themselves a different way (with -Copybara magic). - -If we don't see them fix it the next few months, maybe we can try re- -pinging them. - ---- absl/time/internal/cctz/BUILD.bazel -+++ absl/time/internal/cctz/BUILD.bazel -@@ -34,6 +34,7 @@ cc_library( - hdrs = [ - "include/cctz/civil_time.h", - ], -+ linkopts = [], - textual_hdrs = ["include/cctz/civil_time_detail.h"], - visibility = ["//visibility:public"], - deps = ["//absl/base:config"], diff --git a/tools/workspace/abseil_cpp_internal/repository.bzl b/tools/workspace/abseil_cpp_internal/repository.bzl index 90257bc0364c..d8ad3e7d10af 100644 --- a/tools/workspace/abseil_cpp_internal/repository.bzl +++ b/tools/workspace/abseil_cpp_internal/repository.bzl @@ -6,10 +6,9 @@ def abseil_cpp_internal_repository( github_archive( name = name, repository = "abseil/abseil-cpp", - commit = "3ee08f329825b3f68c988b212bffd332b58e4275", - sha256 = "01474554fc2981e92fcda71c7ce29d3ed4ee8dd0707b346da3f8978cd349fa33", # noqa + commit = "60d1ce9911e6b32ea0c5a2fcfc120f9b392d5643", + sha256 = "29681388beaba7ce2ab73954ed62682d5583d6b6d58728a691d8f298458c5f3b", # noqa patches = [ - ":patches/upstream/civil_time_linkopts.patch", ":patches/upstream/specific_iostream_includes.patch", ":patches/disable_int128_on_clang.patch", ":patches/hidden_visibility.patch",