Patch out old deps from transitive prost extension deps (bazelbuild#3264)

UebelAndre · web-flow · commit acac3e548039 · 2025-02-20T01:41:49.000Z
This would allow me to revert bazelbuild#3214
diff --git a/examples/all_crate_deps/.bazelrc b/examples/all_crate_deps/.bazelrc
@@ -12,5 +12,4 @@ build --incompatible_disallow_empty_glob
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
diff --git a/examples/all_deps_vendor/.bazelrc b/examples/all_deps_vendor/.bazelrc
@@ -45,8 +45,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Rust configuration
diff --git a/examples/bazel_env/.bazelrc b/examples/bazel_env/.bazelrc
@@ -34,8 +34,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/examples/compile_opt/.bazelrc b/examples/compile_opt/.bazelrc
@@ -10,8 +10,7 @@ build --incompatible_disallow_empty_glob
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 # in optimized build we will use thin lto
 common:opt -c opt
diff --git a/examples/crate_universe/.bazelrc b/examples/crate_universe/.bazelrc
@@ -27,8 +27,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/examples/crate_universe_local_path/.bazelrc b/examples/crate_universe_local_path/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/examples/cross_compile/.bazelrc b/examples/cross_compile/.bazelrc
@@ -45,8 +45,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Rust configuration
diff --git a/examples/hello_world/.bazelrc b/examples/hello_world/.bazelrc
@@ -42,8 +42,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Rust configuration
diff --git a/examples/hello_world_no_cargo/.bazelrc b/examples/hello_world_no_cargo/.bazelrc
@@ -45,8 +45,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Rust configuration
diff --git a/examples/musl_cross_compiling/.bazelrc b/examples/musl_cross_compiling/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/examples/nix_cross_compiling/.bazelrc b/examples/nix_cross_compiling/.bazelrc
@@ -73,8 +73,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/examples/override_target/.bazelrc b/examples/override_target/.bazelrc
@@ -12,5 +12,4 @@ build --incompatible_disallow_empty_glob
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
diff --git a/examples/proto/.bazelrc b/examples/proto/.bazelrc
@@ -45,8 +45,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 common --incompatible_enable_proto_toolchain_resolution
 
diff --git a/examples/proto_with_toolchain/.bazelrc b/examples/proto_with_toolchain/.bazelrc
@@ -45,8 +45,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 common --incompatible_enable_proto_toolchain_resolution
 
diff --git a/examples/sys/.bazelrc b/examples/sys/.bazelrc
@@ -45,8 +45,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Rust configuration
diff --git a/extensions/bindgen/.bazelrc b/extensions/bindgen/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/extensions/mdbook/.bazelrc b/extensions/mdbook/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/extensions/prost/.bazelrc b/extensions/prost/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/extensions/prost/MODULE.bazel b/extensions/prost/MODULE.bazel
@@ -35,6 +35,13 @@ register_toolchains(
 bazel_dep(name = "googleapis", version = "0.0.0-20240819-fe8ba054a", dev_dependency = True, repo_name = "com_google_googleapis")
 bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
 
+# TODO: Can be removed when the following is resolved:
+# https://github.com/bazelbuild/bazel/issues/24871
+single_version_override(
+    module_name = "rules_foreign_cc",
+    version = "0.14.0",
+)
+
 rust_ext_dev = use_extension(
     "//private:internal_extensions.bzl",
     "rust_ext_dev",
diff --git a/extensions/protobuf/.bazelrc b/extensions/protobuf/.bazelrc
@@ -61,8 +61,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/extensions/wasm_bindgen/.bazelrc b/extensions/wasm_bindgen/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
diff --git a/test/no_std/.bazelrc b/test/no_std/.bazelrc
@@ -57,8 +57,7 @@ build --nolegacy_external_runfiles
 build --incompatible_merge_fixed_and_default_shell_env
 
 # https://github.com/bazelbuild/bazel/issues/23043.
-# TODO: Re-enable after https://github.com/bazelbuild/bazel/issues/24871 is addressed
-# build --incompatible_autoload_externally=
+build --incompatible_autoload_externally=
 
 ###############################################################################
 ## Bzlmod
