Fix the build: remap prometheus's import of zlib to match gRPC's. (census-instrumentation#236)

g-easy · web-flow · commit 49453c5f0ba3 · 2018-11-16T13:41:38.000+11:00
diff --git a/.bazelrc b/.bazelrc
@@ -4,6 +4,8 @@
 # Needed by gRPC to build on some platforms.
 build --copt -DGRPC_BAZEL_BUILD
 
+common --experimental_enable_repo_mapping
+
 # --config=asan : Address Sanitizer.
 common:asan --copt -fsanitize=address
 common:asan --copt -DADDRESS_SANITIZER
diff --git a/WORKSPACE b/WORKSPACE
@@ -62,6 +62,7 @@ bind(
 # Prometheus client library - used by Prometheus exporter.
 http_archive(
     name = "com_github_jupp0r_prometheus_cpp",
+    repo_mapping = {"@net_zlib_zlib": "@com_github_madler_zlib"},
     strip_prefix = "prometheus-cpp-master",
     urls = ["https://github.com/jupp0r/prometheus-cpp/archive/master.zip"],
 )

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,7 @@ bind(`
`62`	`62`	`# Prometheus client library - used by Prometheus exporter.`
`63`	`63`	`http_archive(`
`64`	`64`	`name = "com_github_jupp0r_prometheus_cpp",`
	`65`	`+ repo_mapping = {"@net_zlib_zlib": "@com_github_madler_zlib"},`
`65`	`66`	`strip_prefix = "prometheus-cpp-master",`
`66`	`67`	`urls = ["https://github.com/jupp0r/prometheus-cpp/archive/master.zip"],`
`67`	`68`	`)`