Skip to content

Commit 2c80d69

Browse files
committed
Update to bazel 9 compatible libarchive
1 parent 1209fe6 commit 2c80d69

File tree

3 files changed

+10
-33
lines changed

3 files changed

+10
-33
lines changed

MODULE.bazel

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ module(
77

88
bazel_dep(name = "platforms", version = "1.0.0")
99
bazel_dep(name = "bazel_lib", version = "3.1.1")
10-
bazel_dep(name = "libarchive", version = "3.8.1")
11-
bazel_dep(name = "toolchains_llvm_bootstrapped", version = "0.4.1")
10+
bazel_dep(name = "libarchive", version = "3.8.1.bcr.1")
11+
bazel_dep(name = "toolchains_llvm_bootstrapped", version = "0.5.2")
1212
bazel_dep(name = "rules_cc", version = "0.2.14")
1313

1414
bazel_dep(name = "bazel_skylib", version = "1.9.0", dev_dependency = True)
@@ -29,32 +29,6 @@ single_version_override(
2929
patch_strip = 1,
3030
)
3131

32-
# bazel9 support: to be upstreamed to libarchive
33-
single_version_override(
34-
module_name = "bzip2",
35-
version = "1.0.8.bcr.3",
36-
)
37-
38-
single_version_override(
39-
module_name = "zstd",
40-
version = "1.5.7.bcr.1",
41-
)
42-
43-
single_version_override(
44-
module_name = "xz",
45-
version = "5.4.5.bcr.7",
46-
)
47-
48-
single_version_override(
49-
module_name = "mbedtls",
50-
version = "3.6.0.bcr.1",
51-
)
52-
53-
single_version_override(
54-
module_name = "zlib",
55-
version = "1.3.1.bcr.8",
56-
)
57-
5832
## TESTS
5933

6034
http_file = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")

MODULE.bazel.lock

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

patches/0001-libarchive_enable_xar_support.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ index cdf2d5b66..1ff04b45c 100644
55
@@ -14,3 +14,4 @@ bazel_dep(name = "platforms", version = "0.0.10")
66
bazel_dep(name = "rules_cc", version = "0.0.9")
77
bazel_dep(name = "bazel_skylib", version = "1.6.1")
8-
bazel_dep(name = "mbedtls", version = "3.6.0")
8+
bazel_dep(name = "mbedtls", version = "3.6.0.bcr.1")
99
+bazel_dep(name = "libxml2", version = "2.15.1.bcr.1")
1010
diff --git a/BUILD.bazel b/BUILD.bazel
1111
index e74107039..fb9fec383 100644

0 commit comments

Comments
 (0)