ray/thirdparty/patches/prometheus-windows-zlib.patch
2019-11-26 14:49:24 -08:00

45 lines
1.7 KiB
Diff

From 78ac107937ee3b94f0b011f9ef0c12b912a222e7 Mon Sep 17 00:00:00 2001
From: easy <g-easy@users.noreply.github.com>
Date: Wed, 14 Nov 2018 16:49:24 +1100
Subject: [PATCH] Rename net_zlib_zlib to com_github_madler_zlib to match gRPC.
diff --git README.md README.md
index be8e683..1dbc917 100644
--- README.md
+++ README.md
@@ -139,7 +139,7 @@ you introduce the following dependencies, if they do not exist yet, to your proj
* `load_com_google_googletest()` to load `com_google_googletest` rules for Google gtest
* `load_com_google_googlebenchmark()` to load `com_github_google_benchmark` rules for Googlebenchmark
* `load_com_github_curl()` to load `com_github_curl` rules for curl
-* `load_net_zlib_zlib()` to load `net_zlib_zlib` rules for zlib
+* `load_com_github_madler_zlib()` to load `com_github_madler_zlib` rules for zlib
The list of dependencies is also available from file `repositories.bzl`.
diff --git pull/BUILD.bazel pull/BUILD.bazel
index 6d90c23..d35f63e 100644
--- pull/BUILD.bazel
+++ pull/BUILD.bazel
@@ -23,6 +23,6 @@ cc_library(
deps = [
"//core",
"@civetweb",
- "@net_zlib_zlib//:z",
+ "@com_github_madler_zlib//:z",
],
)
diff --git bazel/repositories.bzl bazel/repositories.bzl
index 258b73f..91398cf 100644
--- bazel/repositories.bzl
+++ bazel/repositories.bzl
@@ -47,7 +47,8 @@ def prometheus_cpp_repositories():
maybe(
http_archive,
- name = "net_zlib_zlib",
+ # Named "com_github_madler_zlib" to match gRPC's import of zlib.
+ name = "com_github_madler_zlib",
sha256 = "c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1",
strip_prefix = "zlib-1.2.11",
urls = [
--