Skip to content

Commit 2297fce

Browse files
authored
Merge pull request #10933 from hzeller/feature-20260716-use-upstream-tcl
Tcl: local patch is now included in upstream BCR tcl, so we can just use that.
2 parents a9d9dea + 2e3c86f commit 2297fce

4 files changed

Lines changed: 3 additions & 37 deletions

File tree

MODULE.bazel

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -169,20 +169,7 @@ single_version_override(
169169
# from @rules_cc.
170170
bazel_dep(name = "spdlog", version = "1.17.0")
171171
bazel_dep(name = "sv-lang", version = "10.0.1-20260316-f04e8156")
172-
bazel_dep(name = "tcl_lang", version = "9.0.2.bcr.1")
173-
174-
# tclZipfs.c's '#include "crypt.h"' picks up glibc's crypt.h instead of the
175-
# vendored minizip one when glibc headers are explicit -isystem directories
176-
# (hermetic-llvm zero-sysroot toolchain). Drop when fixed in a tcl_lang
177-
# BCR release.
178-
single_version_override(
179-
module_name = "tcl_lang",
180-
patch_strip = 1,
181-
patches = [
182-
"//bazel/tcl-patches:0001-tclZipfs-include-vendored-minizip-crypt.h-by-path.patch",
183-
],
184-
)
185-
172+
bazel_dep(name = "tcl_lang", version = "9.0.2.bcr.2")
186173
bazel_dep(name = "tcmalloc", version = "0.0.0-20250927-12f2552")
187174
bazel_dep(name = "yaml-cpp", version = "0.9.0")
188175
bazel_dep(name = "zlib", version = "1.3.1.bcr.8")

MODULE.bazel.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bazel/tcl-patches/0001-tclZipfs-include-vendored-minizip-crypt.h-by-path.patch

Lines changed: 0 additions & 20 deletions
This file was deleted.

bazel/tcl-patches/BUILD.bazel

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)