Skip to content

Commit 2c32710

Browse files
authored
chore(deps): upgrade abseil to 20210324.2 (#6664)
Fixes: #6627 This version of Abseil adds proper pkgconfig support, so we no longer need dynamically compute the Abseil .so files to link with, instead we can just list the pkg-config deps that we "require" from Abseil. Indeed, our old way of computing the libraries no longer works, so this change was required in the same PR as the Abseil upgrade.
1 parent 3759ea9 commit 2c32710

30 files changed

+73
-197
lines changed

bazel/google_cloud_cpp_deps.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ def google_cloud_cpp_deps():
4141
if "com_google_absl" not in native.existing_rules():
4242
http_archive(
4343
name = "com_google_absl",
44-
strip_prefix = "abseil-cpp-20200923.3",
44+
strip_prefix = "abseil-cpp-20210324.2",
4545
urls = [
46-
"https://github.com/abseil/abseil-cpp/archive/20200923.3.tar.gz",
46+
"https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz",
4747
],
48-
sha256 = "ebe2ad1480d27383e4bf4211e2ca2ef312d5e6a09eba869fd2e8a5c5d553ded2",
48+
sha256 = "59b862f50e710277f8ede96f083a5bb8d7c9595376146838b9580be90374ee1f",
4949
)
5050

5151
# Load a version of googletest that we know works.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

ci/cloudbuild/dockerfiles/demo-centos-7.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ENV PATH=/usr/local/bin:${PATH}
7171

7272
# ```bash
7373
WORKDIR /var/tmp/build/abseil-cpp
74-
RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20200923.3.tar.gz | \
74+
RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz | \
7575
tar -xzf - --strip-components=1 && \
7676
sed -i 's/^#define ABSL_OPTION_USE_\(.*\) 2/#define ABSL_OPTION_USE_\1 0/' "absl/base/options.h" && \
7777
cmake \

ci/cloudbuild/dockerfiles/demo-centos-8.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ENV PATH=/usr/local/bin:${PATH}
4646

4747
# ```bash
4848
WORKDIR /var/tmp/build/abseil-cpp
49-
RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20200923.3.tar.gz | \
49+
RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz | \
5050
tar -xzf - --strip-components=1 && \
5151
sed -i 's/^#define ABSL_OPTION_USE_\(.*\) 2/#define ABSL_OPTION_USE_\1 0/' "absl/base/options.h" && \
5252
cmake \

ci/cloudbuild/dockerfiles/demo-debian-buster.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ RUN apt-get update && \
4242

4343
# ```bash
4444
WORKDIR /var/tmp/build/abseil-cpp
45-
RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20200923.3.tar.gz | \
45+
RUN curl -sSL https://github.com/abseil/abseil-cpp/archive/20210324.2.tar.gz | \
4646
tar -xzf - --strip-components=1 && \
4747
sed -i 's/^#define ABSL_OPTION_USE_\(.*\) 2/#define ABSL_OPTION_USE_\1 0/' "absl/base/options.h" && \
4848
cmake \

0 commit comments

Comments
 (0)