Skip to content

Commit eb989b4

Browse files
committed
merged from upstream
1 parent 4c5e4c2 commit eb989b4

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

.bazelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Track changes in folders referenced by copy_directory
55
startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
66

7-
build --features=parse_headers
7+
#build --features=parse_headers
88
#build --features=layering_check
99

1010
# Don't try to build .so and .dylib shared libs (instead of static) libs on Linux/OSX

MODULE.bazel

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,42 +19,33 @@ bazel_dep(name = "curl", version = "8.8.0.bcr.3")
1919
bazel_dep(name = "depend_on_what_you_use", version = "0.7.0")
2020
bazel_dep(name = "google_benchmark", version = "1.9.1")
2121
bazel_dep(name = "googletest", version = "1.16.0")
22-
bazel_dep(name = "rules_apple", version = "3.18.0")
22+
bazel_dep(name = "rules_apple", version = "3.19.1")
2323
# Getting "No 'swiftc.exe' executable found in Path" with 3.18.0
2424
single_version_override(module_name = "rules_apple", version = "3.17.1")
2525
bazel_dep(name = "re2", version = "2024-07-02.bcr.1")
2626
bazel_dep(name = "rules_go", version = "0.53.0")
2727
bazel_dep(name = "gazelle", version = "0.42.0")
2828
bazel_dep(name = "stardoc", version = "0.8.0")
2929
bazel_dep(name = "rules_android", version = "0.6.3")
30-
3130
bazel_dep(name = "grpc", version = "1.70.1")
32-
3331
bazel_dep(name = "nlohmann_json", version = "3.11.3.bcr.1")
3432
bazel_dep(name = "platforms", version = "0.0.11")
35-
bazel_dep(name = "rules_cc", version = "0.1.0")
36-
single_version_override(
37-
module_name = "rules_cc", version = "0.0.17"
38-
)
33+
bazel_dep(name = "rules_cc", version = "0.1.1")
3934
bazel_dep(name = "rules_pkg", version = "1.0.1")
4035
bazel_dep(name = "rules_proto", version = "7.1.0")
4136
bazel_dep(name = "zlib", version = "1.3.1.bcr.5")
4237
bazel_dep(name = "opentracing-cpp", version = "1.6.0")
4338
bazel_dep(name = "rules_multitool", version = "1.0.0")
4439
bazel_dep(name = "protoc-gen-validate", version = "1.2.1")
45-
4640
bazel_dep(name = "c-ares", version = "1.16.1")
4741
archive_override(
4842
module_name = "c-ares",
49-
urls=["https://github.com/malkia/c-ares/archive/548f7f9d3fa42bd4874b6c4b2979ea1fd2cd6952.zip"],
50-
integrity = "sha256-sO3H/U6fRoXGntJujkdyVMel636mDOJhB27rutS8r98=",
51-
strip_prefix="c-ares-548f7f9d3fa42bd4874b6c4b2979ea1fd2cd6952"
43+
urls=["https://github.com/malkia/c-ares/archive/0b0d375f08edfc73d2f37090e9325c5bd600c043.zip"],
44+
integrity = "sha256-BAWtdpkKHShUobytt64s4gqoCFZTuV/Jim2jlfAesnw=",
45+
strip_prefix="c-ares-0b0d375f08edfc73d2f37090e9325c5bd600c043"
5246
)
53-
54-
# ERROR: Q:/b/u/c56xnmzt/external/protobuf+/src/google/protobuf/BUILD.bazel:462:11: Compiling src/google/protobuf/any_lite.cc [for tool] failed: undeclared inclusion(s) in rule '@@protobuf+//src/google/protobuf:protobuf_lite':
55-
# this rule is missing dependency declarations for the following files included by 'src/google/protobuf/any_lite.cc':
56-
# 'bazel-out/x64_windows-opt-exec-ST-d610928244b0/bin/external/protobuf+/src/google/protobuf/_virtual_includes/protobuf_lite/google/protobuf/port.h'
57-
bazel_dep(name = "protobuf", version = "29.3")
47+
bazel_dep(name = "protobuf", version = "30.0")
48+
single_version_override(module_name = "protobuf", version = "29.3")
5849
bazel_dep(name = "opentelemetry-proto", version = "1.5.0")
5950
archive_override(
6051
module_name = "opentelemetry-proto",
@@ -66,7 +57,6 @@ archive_override(
6657
strip_prefix = "opentelemetry-proto-1.5.0",
6758
urls = ["https://github.com/open-telemetry/opentelemetry-proto/archive/refs/tags/v1.5.0.tar.gz"]
6859
)
69-
7060
bazel_dep(name = "prometheus-cpp", version = "1.3.0.bcr.2")
7161
bazel_dep(name = "civetweb", version = "1.16.bcr.1")
7262

0 commit comments

Comments
 (0)