From 5b31f1e3e9cd1fcc34d85e38b9423902d24d0dc7 Mon Sep 17 00:00:00 2001 From: MediaPipe Team Date: Thu, 27 Jul 2023 12:04:50 -0700 Subject: [PATCH] Update glog to latest commit PiperOrigin-RevId: 551601991 --- WORKSPACE | 12 ++++++------ third_party/com_github_glog_glog.diff | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a1ec2ab52..eae8af41c 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -157,19 +157,19 @@ http_archive( # 2020-08-21 http_archive( name = "com_github_glog_glog", - strip_prefix = "glog-0.6.0", - sha256 = "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6", + strip_prefix = "glog-3a0d4d22c5ae0b9a2216988411cfa6bf860cc372", + sha256 = "170d08f80210b82d95563f4723a15095eff1aad1863000e8eeb569c96a98fefb", urls = [ - "https://github.com/google/glog/archive/v0.6.0.tar.gz", + "https://github.com/google/glog/archive/3a0d4d22c5ae0b9a2216988411cfa6bf860cc372.zip", ], ) http_archive( name = "com_github_glog_glog_no_gflags", - strip_prefix = "glog-0.6.0", - sha256 = "8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6", + strip_prefix = "glog-3a0d4d22c5ae0b9a2216988411cfa6bf860cc372", + sha256 = "170d08f80210b82d95563f4723a15095eff1aad1863000e8eeb569c96a98fefb", build_file = "@//third_party:glog_no_gflags.BUILD", urls = [ - "https://github.com/google/glog/archive/v0.6.0.tar.gz", + "https://github.com/google/glog/archive/3a0d4d22c5ae0b9a2216988411cfa6bf860cc372.zip", ], patches = [ "@//third_party:com_github_glog_glog.diff", diff --git a/third_party/com_github_glog_glog.diff b/third_party/com_github_glog_glog.diff index bf08045b3..1cc0a38bd 100644 --- a/third_party/com_github_glog_glog.diff +++ b/third_party/com_github_glog_glog.diff @@ -39,3 +39,17 @@ index 4028ccc..483e639 100644 if (append_newline) { // Fix the ostrstream back how it was before we screwed with it. // It's 99.44% certain that we don't need to worry about doing this. + +diff --git a/bazel/glog.bzl b/bazel/glog.bzl +index dacd934..62d2a88 100644 +--- a/bazel/glog.bzl ++++ b/bazel/glog.bzl +@@ -53,7 +53,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs): + ) + + common_copts = [ +- "-std=c++14", ++ "-std=c++17", + "-DGLOG_BAZEL_BUILD", + # Inject a C++ namespace. + "-DGOOGLE_NAMESPACE='%s'" % namespace, \ No newline at end of file