Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump abseil-cpp version to 20220623.1 #18184

Closed
wants to merge 6 commits into from
Closed

Bump abseil-cpp version to 20220623.1 #18184

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2c95395
Bump abseil-cpp version to 20220623.1
davido Apr 23, 2023
9e4cfb7
Add patch to revert b8bbe92f8 in abseil-cpp project
davido Apr 23, 2023
bef27a1
Fix bazel_bootstrap_distfile_test
davido Apr 23, 2023
48af13c
Add Bazel mirror for 20220623.1.tar.gz artifact
davido Apr 24, 2023
024347e
Patch grpc 1.47.0 to be compatible with abseil-cpp
davido Apr 25, 2023
971b40f
Remove abseil-cpp patch
davido Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions distdir_deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,22 +246,24 @@ DIST_DEPS = {
],
},
"com_google_absl": {
"archive": "20211102.0.tar.gz",
"sha256": "dcf71b9cba8dc0ca9940c4b316a0c796be8fab42b070bb6b7cab62b48f0e66c4",
"archive": "20220623.1.tar.gz",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind also help submitting this version to https://github.com/bazelbuild/bazel-central-registry/tree/main/modules/abseil-cpp? So that we can also upgrade abseil to the same version with Bzlmod enabled.

"patch_args": ["-p1"],
"patches": ["//third_party/abseil-cpp:20220623.1.patch"],
meteorcloudy marked this conversation as resolved.
Show resolved Hide resolved
"sha256": "91ac87d30cc6d79f9ab974c51874a704de9c2647c40f6932597329a282217ba8",
"urls": [
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz",
"https://mirror.bazel.build/github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
"https://github.com/abseil/abseil-cpp/archive/refs/tags/20220623.1.tar.gz",
],
"used_in": [
"additional_distfiles",
"test_WORKSPACE_files",
],
"strip_prefix": "abseil-cpp-20211102.0",
"strip_prefix": "abseil-cpp-20220623.1",
"license_kinds": [
"@rules_license//licenses/generic:notice",
],
"license_text": "LICENSE",
"package_version": "2021-11-02.0",
"package_version": "20220623.1",
},
"zstd-jni": {
"archive": "v1.5.2-3.zip",
Expand Down
1 change: 1 addition & 0 deletions third_party/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package(default_visibility = ["//visibility:public"])
filegroup(
name = "srcs",
srcs = glob(["**"]) + [
"//third_party/abseil-cpp:srcs",
"//third_party/allocation_instrumenter:srcs",
"//third_party/android_dex:srcs",
"//third_party/def_parser:srcs",
Expand Down
25 changes: 25 additions & 0 deletions third_party/abseil-cpp/20220623.1.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
Date: Sun, 23 Apr 2023 13:42:26 +0200
Subject: [PATCH] Revert "Change workaround for MSVC bug regarding compile-time
initialization to trigger from MSC_VER 1910 to 1930."

This reverts commit b8bbe92f84ffe1e249016cfe8b79efdffb7a35c1.
---
absl/time/time.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/absl/time/time.h b/absl/time/time.h
index bd01867e..bf68f041 100644
--- a/absl/time/time.h
+++ b/absl/time/time.h
@@ -162,7 +162,7 @@ class Duration {
constexpr Duration() : rep_hi_(0), rep_lo_(0) {} // zero-length duration

// Copyable.
-#if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1930
+#if !defined(__clang__) && defined(_MSC_VER) && _MSC_VER < 1910
// Explicitly defining the constexpr copy constructor avoids an MSVC bug.
constexpr Duration(const Duration& d)
: rep_hi_(d.rep_hi_), rep_lo_(d.rep_lo_) {}
--
2.40.0

8 changes: 8 additions & 0 deletions third_party/abseil-cpp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package(default_visibility = ["//visibility:public"])

exports_files(["20220623.1.patch"])

filegroup(
name = "srcs",
srcs = glob(["**"]),
)