mirror of
https://github.com/wassname/ray.git
synced 2026-08-15 12:45:23 +08:00
Simplify patches and make them more robust (#6478)
* Get rid of 'index' lines in patches, which are unnecessary and likely wrong anyway (esp. when there are multiple patches) * Simplify patches to remove unnecessary context and make them more robust
This commit is contained in:
+2
-8
@@ -1,17 +1,11 @@
|
||||
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",
|
||||
@@ -19,3 +19,2 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
|
||||
"-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",
|
||||
@@ -38,5 +37,7 @@ def glog_library(namespace = "google", with_gflags = 1, **kwargs):
|
||||
# Enable dumping stacktrace upon sigaction.
|
||||
"-DHAVE_SIGACTION",
|
||||
+ "-DHAVE_EXECINFO_H",
|
||||
|
||||
Reference in New Issue
Block a user