Update glog (ray-project#6287)

tomzhang · Nov 26, 2019 · cafdaa3 · cafdaa3
1 parent 5340e52
commit cafdaa3
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 157 deletions.
diff --git a/bazel/BUILD.glog b/bazel/BUILD.glog
diff --git a/bazel/glog.bzl b/bazel/glog.bzl
diff --git a/bazel/ray_deps_setup.bzl b/bazel/ray_deps_setup.bzl
@@ -137,10 +137,12 @@ def ray_deps_setup():
 
     github_repository(
         name = "com_github_google_glog",
-        build_file = "@//bazel:BUILD.glog",
-        commit = "96a2f23dca4cc7180821ca5f32e526314395d26a",
+        commit = "925858d9969d8ee22aabc3635af00a37891f4e25",
         remote = "https://github.com/google/glog",
-        sha256 = "6281aa4eeecb9e932d7091f99872e7b26fa6aacece49c15ce5b14af2b7ec050f",
+        sha256 = "dbe787f2a7cf1146f748a191c99ae85d6b931dd3ebdcc76aa7ccae3699149c67",
+        patches = [
+            "//thirdparty/patches:glog-stack-trace.patch",
+        ],
     )
 
     github_repository(

diff --git a/thirdparty/patches/glog-stack-trace.patch b/thirdparty/patches/glog-stack-trace.patch
@@ -0,0 +1,22 @@
+diff --git bazel/glog.bzl bazel/glog.bzl
+index 4c11f12..2510ecc 100644
+--- bazel/glog.bzl
++++ bazel/glog.bzl
+@@ -17,7 +17,6 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
+         "-DGLOG_BAZEL_BUILD",
+         "-DHAVE_STDINT_H",
+         "-DHAVE_STRING_H",
+-        "-DHAVE_UNWIND_H",
+     ] + (["-DHAVE_LIB_GFLAGS"] if with_gflags else [])
+
+     linux_or_darwin_copts = [
+@@ -37,6 +36,8 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
+         "-DHAVE_SYS_TIME_H",
+         # Enable dumping stacktrace upon sigaction.
+         "-DHAVE_SIGACTION",
++        "-DHAVE_EXECINFO_H",
++        "-DHAVE_SYMBOLIZE",
+         # For logging.cc.
+         "-DHAVE_PREAD",
+         "-DHAVE___ATTRIBUTE__",
+--