[llvm] [bazel] Add explicit dep on protobuf (PR #168928)
Keith Smiley via llvm-commits
llvm-commits at lists.llvm.org
Thu Nov 20 10:24:09 PST 2025
https://github.com/keith created https://github.com/llvm/llvm-project/pull/168928
This is required for correctly loading the protobuf rules. It's
possible we could drop the version here to a lower version, as long as
that version supports the versions of bazel we support. I picked this
because it is the current version being used by bazel 8.0.0 (which is
defined in the .bazelversion). Users can override this in their project
anyways if they need an older one
>From aaf42aacbf319c8a7639b8bc98aeb2f35cb07ec4 Mon Sep 17 00:00:00 2001
From: Keith Smiley <keithbsmiley at gmail.com>
Date: Thu, 20 Nov 2025 18:22:56 +0000
Subject: [PATCH] [bazel] Add explicit dep on protobuf
This is required for correctly loading the protobuf rules. It's
possible we could drop the version here to a lower version, as long as
that version supports the versions of bazel we support. I picked this
because it is the current version being used by bazel 8.0.0 (which is
defined in the .bazelversion). Users can override this in their project
anyways if they need an older one
---
utils/bazel/MODULE.bazel | 15 +-
utils/bazel/MODULE.bazel.lock | 349 ++++++++++++++++++
.../llvm-project-overlay/clang/BUILD.bazel | 2 +
3 files changed, 359 insertions(+), 7 deletions(-)
diff --git a/utils/bazel/MODULE.bazel b/utils/bazel/MODULE.bazel
index e99ddfcb8ad2e..1a8327c33d246 100644
--- a/utils/bazel/MODULE.bazel
+++ b/utils/bazel/MODULE.bazel
@@ -3,11 +3,13 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
"""bzlmod configuration for llvm-project"""
+
module(name = "llvm-project-overlay")
bazel_dep(name = "apple_support", version = "1.24.1", repo_name = "build_bazel_apple_support")
bazel_dep(name = "bazel_skylib", version = "1.8.2")
bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "protobuf", version = "31.1", repo_name = "com_google_protobuf")
bazel_dep(name = "rules_android", version = "0.6.6")
bazel_dep(name = "rules_cc", version = "0.2.11")
bazel_dep(name = "rules_foreign_cc", version = "0.15.1")
@@ -15,22 +17,21 @@ bazel_dep(name = "rules_python", version = "1.6.3")
bazel_dep(name = "rules_shell", version = "0.6.1")
llvm_repos_extension = use_extension(":extensions.bzl", "llvm_repos_extension")
-
use_repo(
llvm_repos_extension,
+ "gmp",
"llvm-raw",
"llvm_zlib",
- "vulkan_headers",
- "vulkan_sdk",
- "gmp",
- "mpfr",
+ "llvm_zstd",
"mpc",
+ "mpfr",
+ "nanobind",
"pfm",
- "llvm_zstd",
"pybind11",
"pyyaml",
"robin_map",
- "nanobind",
+ "vulkan_headers",
+ "vulkan_sdk",
)
llvm_configure = use_repo_rule("@llvm-raw//utils/bazel:configure.bzl", "llvm_configure")
diff --git a/utils/bazel/MODULE.bazel.lock b/utils/bazel/MODULE.bazel.lock
index 4715d52a10545..dccb655166349 100644
--- a/utils/bazel/MODULE.bazel.lock
+++ b/utils/bazel/MODULE.bazel.lock
@@ -370,6 +370,86 @@
]
}
},
+ "@@pybind11_bazel+//:internal_configure.bzl%internal_configure_extension": {
+ "general": {
+ "bzlTransitiveDigest": "yA4GkX1zdUTOXU4qKsh/YkjZKHAWkG8Fd7adNeGwiRc=",
+ "usagesDigest": "D1r3lfzMuUBFxgG8V6o0bQTLMk3GkaGOaPzw53wrwyw=",
+ "recordedFileInputs": {
+ "@@pybind11_bazel+//MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34"
+ },
+ "recordedDirentsInputs": {},
+ "envVariables": {},
+ "generatedRepoSpecs": {
+ "pybind11": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "build_file": "@@pybind11_bazel+//:pybind11-BUILD.bazel",
+ "strip_prefix": "pybind11-2.12.0",
+ "urls": [
+ "https://github.com/pybind/pybind11/archive/v2.12.0.zip"
+ ]
+ }
+ }
+ },
+ "recordedRepoMappingEntries": [
+ [
+ "pybind11_bazel+",
+ "bazel_tools",
+ "bazel_tools"
+ ]
+ ]
+ }
+ },
+ "@@rules_android+//bzlmod_extensions:apksig.bzl%apksig_extension": {
+ "general": {
+ "bzlTransitiveDigest": "BjalZzJZCCeFUitHa3nPXYW0o22VinHOSCBGaN0y87Q=",
+ "usagesDigest": "xq6OVkELeJvOgYo3oY/sUBsGFbcqdV+9BYiNgSPV/po=",
+ "recordedFileInputs": {},
+ "recordedDirentsInputs": {},
+ "envVariables": {},
+ "generatedRepoSpecs": {
+ "apksig": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "url": "https://android.googlesource.com/platform/tools/apksig/+archive/24e3075e68ebe17c0b529bb24bfda819db5e2f3b.tar.gz",
+ "build_file": "@@rules_android+//bzlmod_extensions:apksig.BUILD"
+ }
+ }
+ },
+ "recordedRepoMappingEntries": [
+ [
+ "rules_android+",
+ "bazel_tools",
+ "bazel_tools"
+ ]
+ ]
+ }
+ },
+ "@@rules_android+//bzlmod_extensions:com_android_dex.bzl%com_android_dex_extension": {
+ "general": {
+ "bzlTransitiveDigest": "BdBdkUCw12q7PiZUvEXBXYK0UThDPvrQfuMO7zGCHAM=",
+ "usagesDigest": "toF8IFMu98H/VU2p1sfVC5fVXVYJunpbbmtM6tOsQXY=",
+ "recordedFileInputs": {},
+ "recordedDirentsInputs": {},
+ "envVariables": {},
+ "generatedRepoSpecs": {
+ "com_android_dex": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "url": "https://android.googlesource.com/platform/dalvik/+archive/5a81c499a569731e2395f7c8d13c0e0d4e17a2b6.tar.gz",
+ "build_file": "@@rules_android+//bzlmod_extensions:com_android_dex.BUILD"
+ }
+ }
+ },
+ "recordedRepoMappingEntries": [
+ [
+ "rules_android+",
+ "bazel_tools",
+ "bazel_tools"
+ ]
+ ]
+ }
+ },
"@@rules_android+//rules/android_sdk_repository:rule.bzl%android_sdk_repository_extension": {
"general": {
"bzlTransitiveDigest": "NAy+0M15JNVEBb8Tny6t7j3lKqTnsAMjoBB6LJ+C370=",
@@ -386,6 +466,116 @@
"recordedRepoMappingEntries": []
}
},
+ "@@rules_apple+//apple:apple.bzl%provisioning_profile_repository_extension": {
+ "general": {
+ "bzlTransitiveDigest": "CUIdbxeGZ+GPvVqbCkw9HQeJLsqeG3I1pJQ+oyZr/D4=",
+ "usagesDigest": "vsJl8Rw5NL+5Ag2wdUDoTeRF/5klkXO8545Iy7U1Q08=",
+ "recordedFileInputs": {},
+ "recordedDirentsInputs": {},
+ "envVariables": {},
+ "generatedRepoSpecs": {
+ "local_provisioning_profiles": {
+ "repoRuleId": "@@rules_apple+//apple/internal:local_provisioning_profiles.bzl%provisioning_profile_repository",
+ "attributes": {}
+ }
+ },
+ "recordedRepoMappingEntries": [
+ [
+ "apple_support+",
+ "bazel_skylib",
+ "bazel_skylib+"
+ ],
+ [
+ "bazel_tools",
+ "rules_cc",
+ "rules_cc+"
+ ],
+ [
+ "rules_apple+",
+ "bazel_skylib",
+ "bazel_skylib+"
+ ],
+ [
+ "rules_apple+",
+ "bazel_tools",
+ "bazel_tools"
+ ],
+ [
+ "rules_apple+",
+ "build_bazel_apple_support",
+ "apple_support+"
+ ],
+ [
+ "rules_apple+",
+ "build_bazel_rules_swift",
+ "rules_swift+"
+ ],
+ [
+ "rules_cc+",
+ "bazel_tools",
+ "bazel_tools"
+ ],
+ [
+ "rules_cc+",
+ "rules_cc",
+ "rules_cc+"
+ ],
+ [
+ "rules_swift+",
+ "bazel_skylib",
+ "bazel_skylib+"
+ ],
+ [
+ "rules_swift+",
+ "bazel_tools",
+ "bazel_tools"
+ ],
+ [
+ "rules_swift+",
+ "build_bazel_apple_support",
+ "apple_support+"
+ ],
+ [
+ "rules_swift+",
+ "build_bazel_rules_swift",
+ "rules_swift+"
+ ],
+ [
+ "rules_swift+",
+ "build_bazel_rules_swift_local_config",
+ "rules_swift++non_module_deps+build_bazel_rules_swift_local_config"
+ ]
+ ]
+ }
+ },
+ "@@rules_apple+//apple:extensions.bzl%non_module_deps": {
+ "general": {
+ "bzlTransitiveDigest": "rdeowIB16n42a/MEy5gV/a/kpjt45s1nmLJCD/kXsPU=",
+ "usagesDigest": "M3VqFpeTCo4qmrNKGZw0dxBHvTYDrfV3cscGzlSAhQ4=",
+ "recordedFileInputs": {},
+ "recordedDirentsInputs": {},
+ "envVariables": {},
+ "generatedRepoSpecs": {
+ "xctestrunner": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/google/xctestrunner/archive/b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6.tar.gz"
+ ],
+ "strip_prefix": "xctestrunner-b7698df3d435b6491b4b4c0f9fc7a63fbed5e3a6",
+ "sha256": "ae3a063c985a8633cb7eb566db21656f8db8eb9a0edb8c182312c7f0db53730d"
+ }
+ }
+ },
+ "recordedRepoMappingEntries": [
+ [
+ "rules_apple+",
+ "bazel_tools",
+ "bazel_tools"
+ ]
+ ]
+ }
+ },
"@@rules_kotlin+//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": {
"general": {
"bzlTransitiveDigest": "sFhcgPbDQehmbD1EOXzX4H1q/CD5df8zwG4kp4jbvr8=",
@@ -485,6 +675,165 @@
]
]
}
+ },
+ "@@rules_swift+//swift:extensions.bzl%non_module_deps": {
+ "general": {
+ "bzlTransitiveDigest": "X3B53n1AmUggqagsfW3TwgDmiWEQnqWY1izDXQ3mZtY=",
+ "usagesDigest": "mhACFnrdMv9Wi0Mt67bxocJqviRkDSV+Ee5Mqdj5akA=",
+ "recordedFileInputs": {},
+ "recordedDirentsInputs": {},
+ "envVariables": {},
+ "generatedRepoSpecs": {
+ "com_github_apple_swift_protobuf": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-protobuf/archive/1.20.2.tar.gz"
+ ],
+ "sha256": "3fb50bd4d293337f202d917b6ada22f9548a0a0aed9d9a4d791e6fbd8a246ebb",
+ "strip_prefix": "swift-protobuf-1.20.2/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_protobuf/BUILD.overlay"
+ }
+ },
+ "com_github_grpc_grpc_swift": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/grpc/grpc-swift/archive/1.16.0.tar.gz"
+ ],
+ "sha256": "58b60431d0064969f9679411264b82e40a217ae6bd34e17096d92cc4e47556a5",
+ "strip_prefix": "grpc-swift-1.16.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_grpc_grpc_swift/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_docc_symbolkit": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-docc-symbolkit/archive/refs/tags/swift-5.10-RELEASE.tar.gz"
+ ],
+ "sha256": "de1d4b6940468ddb53b89df7aa1a81323b9712775b0e33e8254fa0f6f7469a97",
+ "strip_prefix": "swift-docc-symbolkit-swift-5.10-RELEASE",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_docc_symbolkit/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_nio": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-nio/archive/2.42.0.tar.gz"
+ ],
+ "sha256": "e3304bc3fb53aea74a3e54bd005ede11f6dc357117d9b1db642d03aea87194a0",
+ "strip_prefix": "swift-nio-2.42.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_nio_http2": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-nio-http2/archive/1.26.0.tar.gz"
+ ],
+ "sha256": "f0edfc9d6a7be1d587e5b403f2d04264bdfae59aac1d74f7d974a9022c6d2b25",
+ "strip_prefix": "swift-nio-http2-1.26.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_http2/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_nio_transport_services": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-nio-transport-services/archive/1.15.0.tar.gz"
+ ],
+ "sha256": "f3498dafa633751a52b9b7f741f7ac30c42bcbeb3b9edca6d447e0da8e693262",
+ "strip_prefix": "swift-nio-transport-services-1.15.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_transport_services/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_nio_extras": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-nio-extras/archive/1.4.0.tar.gz"
+ ],
+ "sha256": "4684b52951d9d9937bb3e8ccd6b5daedd777021ef2519ea2f18c4c922843b52b",
+ "strip_prefix": "swift-nio-extras-1.4.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_extras/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_log": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-log/archive/1.4.4.tar.gz"
+ ],
+ "sha256": "48fe66426c784c0c20031f15dc17faf9f4c9037c192bfac2f643f65cb2321ba0",
+ "strip_prefix": "swift-log-1.4.4/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_log/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_nio_ssl": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-nio-ssl/archive/2.23.0.tar.gz"
+ ],
+ "sha256": "4787c63f61dd04d99e498adc3d1a628193387e41efddf8de19b8db04544d016d",
+ "strip_prefix": "swift-nio-ssl-2.23.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_nio_ssl/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_collections": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-collections/archive/1.0.4.tar.gz"
+ ],
+ "sha256": "d9e4c8a91c60fb9c92a04caccbb10ded42f4cb47b26a212bc6b39cc390a4b096",
+ "strip_prefix": "swift-collections-1.0.4/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_collections/BUILD.overlay"
+ }
+ },
+ "com_github_apple_swift_atomics": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "urls": [
+ "https://github.com/apple/swift-atomics/archive/1.1.0.tar.gz"
+ ],
+ "sha256": "1bee7f469f7e8dc49f11cfa4da07182fbc79eab000ec2c17bfdce468c5d276fb",
+ "strip_prefix": "swift-atomics-1.1.0/",
+ "build_file": "@@rules_swift+//third_party:com_github_apple_swift_atomics/BUILD.overlay"
+ }
+ },
+ "build_bazel_rules_swift_index_import": {
+ "repoRuleId": "@@bazel_tools//tools/build_defs/repo:http.bzl%http_archive",
+ "attributes": {
+ "build_file": "@@rules_swift+//third_party:build_bazel_rules_swift_index_import/BUILD.overlay",
+ "canonical_id": "index-import-5.8",
+ "urls": [
+ "https://github.com/MobileNativeFoundation/index-import/releases/download/5.8.0.1/index-import.tar.gz"
+ ],
+ "sha256": "28c1ffa39d99e74ed70623899b207b41f79214c498c603915aef55972a851a15"
+ }
+ },
+ "build_bazel_rules_swift_local_config": {
+ "repoRuleId": "@@rules_swift+//swift/internal:swift_autoconfiguration.bzl%swift_autoconfiguration",
+ "attributes": {}
+ }
+ },
+ "recordedRepoMappingEntries": [
+ [
+ "rules_swift+",
+ "bazel_tools",
+ "bazel_tools"
+ ],
+ [
+ "rules_swift+",
+ "build_bazel_rules_swift",
+ "rules_swift+"
+ ]
+ ]
+ }
}
}
}
diff --git a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
index 790709bdef05c..0dca7a84fb3d1 100644
--- a/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
+++ b/utils/bazel/llvm-project-overlay/clang/BUILD.bazel
@@ -2,6 +2,8 @@
# See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+load("@com_google_protobuf//bazel:cc_proto_library.bzl", "cc_proto_library")
+load("@com_google_protobuf//bazel:proto_library.bzl", "proto_library")
load("@rules_cc//cc:defs.bzl", "cc_binary", "cc_library")
load("@rules_python//python:defs.bzl", "py_binary")
load(
More information about the llvm-commits
mailing list