Skip to content

Commit 382e24d

Browse files
laramielcopybara-github
laramiel
authored and
copybara-github
committed
Update bzip2, zstd, and xz to use bzlmod library names
PiperOrigin-RevId: 753243156 Change-Id: I6e7f0eea8cd983f8ab58b5c21f68dca80707a90b
1 parent 6372ceb commit 382e24d

File tree

15 files changed

+141
-15
lines changed

15 files changed

+141
-15
lines changed

‎tensorstore/internal/compression/BUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ tensorstore_cc_library(
139139
"@riegeli//riegeli/bytes:writer",
140140
"@riegeli//riegeli/xz:xz_reader",
141141
"@riegeli//riegeli/xz:xz_writer",
142-
"@xz//:liblzma",
142+
"@xz//:lzma",
143143
],
144144
)
145145

@@ -153,7 +153,7 @@ tensorstore_cc_test(
153153
"@abseil-cpp//absl/strings:cord",
154154
"@abseil-cpp//absl/strings:cord_test_helpers",
155155
"@googletest//:gtest_main",
156-
"@xz//:liblzma",
156+
"@xz//:lzma",
157157
],
158158
)
159159

‎third_party/bzip2/bzip2.BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ licenses(["notice"])
55
exports_files(["LICENSE"])
66

77
cc_library(
8-
name = "bz2lib",
8+
name = "bz2",
99
srcs = [
1010
"blocksort.c",
1111
"bzlib.c",

‎third_party/bzip2/system.BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cc_library(
2-
name = "bz2lib",
2+
name = "bz2",
33
linkopts = ["-lbz2"],
44
visibility = ["//visibility:public"],
55
)

‎third_party/bzip2/workspace.bzl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ def repo():
3636
cmake_languages = ["C"],
3737
bazel_to_cmake = {},
3838
cmake_target_mapping = {
39-
"//:bz2lib": "BZip2::BZip2",
39+
"//:bz2": "BZip2::BZip2",
4040
},
4141
)

‎third_party/curl/curl.BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ cc_library(
142142
defines = ["CURL_STATICLIB"],
143143
implementation_deps = [
144144
"@zlib//:zlib",
145-
"@zstd//:zstdlib",
145+
"@zstd//:zstd",
146146
"@brotli//:brotlidec",
147147
# "@c-ares//:ares",
148148
"@org_nghttp2//:nghttp2",

‎third_party/libtiff/libtiff.BUILD.bazel‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ cc_library(
9696
deps = [
9797
"@libjpeg_turbo//:jpeg",
9898
"@zlib//:zlib",
99-
"@zstd//:zstdlib",
100-
"@xz//:liblzma",
99+
"@zstd//:zstd",
100+
"@xz//:lzma",
101101
],
102102
)
103103

‎third_party/org_blosc_cblosc/cblosc.BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ cc_library(
180180
":shuffle",
181181
"@snappy//:snappy",
182182
"@zlib//:zlib",
183-
"@zstd//:zstdlib",
183+
"@zstd//:zstd",
184184
"@lz4//:lz4",
185185
] + select(
186186
{

‎third_party/riegeli/patches/build.diff‎

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
diff '--color=auto' -Nur a/riegeli/bzip2/BUILD b/riegeli/bzip2/BUILD
2+
--- a/riegeli/bzip2/BUILD 2023-12-12 14:30:23.000000000 +0000
3+
+++ b/riegeli/bzip2/BUILD 2025-04-30 17:01:39.731548066 +0000
4+
@@ -20,7 +20,7 @@
5+
"//riegeli/bytes:buffer_options",
6+
"//riegeli/bytes:buffered_reader",
7+
"//riegeli/bytes:reader",
8+
- "@bzip2//:bz2lib",
9+
+ "@bzip2//:bz2",
10+
"@com_google_absl//absl/base:core_headers",
11+
"@com_google_absl//absl/status",
12+
"@com_google_absl//absl/strings",
13+
@@ -42,7 +42,7 @@
14+
"//riegeli/bytes:buffer_options",
15+
"//riegeli/bytes:buffered_writer",
16+
"//riegeli/bytes:writer",
17+
- "@bzip2//:bz2lib",
18+
+ "@bzip2//:bz2",
19+
"@com_google_absl//absl/base:core_headers",
20+
"@com_google_absl//absl/status",
21+
"@com_google_absl//absl/strings",
22+
@@ -56,7 +56,7 @@
23+
visibility = ["//visibility:private"],
24+
deps = [
25+
"//riegeli/base:assert",
26+
- "@bzip2//:bz2lib",
27+
+ "@bzip2//:bz2",
28+
"@com_google_absl//absl/status",
29+
"@com_google_absl//absl/strings",
30+
],
31+
diff '--color=auto' -Nur a/riegeli/xz/BUILD b/riegeli/xz/BUILD
32+
--- a/riegeli/xz/BUILD 2023-12-12 14:30:23.000000000 +0000
33+
+++ b/riegeli/xz/BUILD 2025-04-30 17:04:42.351143298 +0000
34+
@@ -25,7 +25,7 @@
35+
"@com_google_absl//absl/base:core_headers",
36+
"@com_google_absl//absl/status",
37+
"@com_google_absl//absl/strings",
38+
- "@xz//:liblzma",
39+
+ "@xz//:lzma",
40+
],
41+
)
42+
43+
@@ -51,7 +51,7 @@
44+
"@com_google_absl//absl/base:core_headers",
45+
"@com_google_absl//absl/status",
46+
"@com_google_absl//absl/strings",
47+
- "@xz//:liblzma",
48+
+ "@xz//:lzma",
49+
],
50+
)
51+
52+
@@ -64,6 +64,6 @@
53+
"//riegeli/base:assert",
54+
"@com_google_absl//absl/status",
55+
"@com_google_absl//absl/strings",
56+
- "@xz//:liblzma",
57+
+ "@xz//:lzma",
58+
],
59+
)
60+
diff '--color=auto' -Nur a/riegeli/zstd/BUILD b/riegeli/zstd/BUILD
61+
--- a/riegeli/zstd/BUILD 2023-12-12 14:30:23.000000000 +0000
62+
+++ b/riegeli/zstd/BUILD 2025-04-30 17:02:57.003379019 +0000
63+
@@ -28,7 +28,7 @@
64+
"@com_google_absl//absl/status",
65+
"@com_google_absl//absl/strings",
66+
"@com_google_absl//absl/types:optional",
67+
- "@net_zstd//:zstdlib",
68+
+ "@net_zstd//:zstd",
69+
],
70+
)
71+
72+
@@ -57,7 +57,7 @@
73+
"@com_google_absl//absl/status",
74+
"@com_google_absl//absl/strings",
75+
"@com_google_absl//absl/types:optional",
76+
- "@net_zstd//:zstdlib",
77+
+ "@net_zstd//:zstd",
78+
],
79+
)
80+
81+
@@ -76,6 +76,6 @@
82+
"@com_google_absl//absl/base:core_headers",
83+
"@com_google_absl//absl/strings",
84+
"@com_google_absl//absl/synchronization",
85+
- "@net_zstd//:zstdlib",
86+
+ "@net_zstd//:zstd",
87+
],
88+
)
89+
diff '--color=auto' -Nur a/third_party/bzip2.BUILD b/third_party/bzip2.BUILD
90+
--- a/third_party/bzip2.BUILD 2023-12-12 14:30:23.000000000 +0000
91+
+++ b/third_party/bzip2.BUILD 2025-04-30 17:01:19.875590905 +0000
92+
@@ -6,7 +6,7 @@
93+
licenses(["notice"])
94+
95+
cc_library(
96+
- name = "bz2lib",
97+
+ name = "bz2",
98+
srcs = [
99+
"blocksort.c",
100+
"bzlib.c",
101+
diff '--color=auto' -Nur a/third_party/net_zstd.BUILD b/third_party/net_zstd.BUILD
102+
--- a/third_party/net_zstd.BUILD 2023-12-12 14:30:23.000000000 +0000
103+
+++ b/third_party/net_zstd.BUILD 2025-04-30 17:02:40.435415562 +0000
104+
@@ -6,7 +6,7 @@
105+
licenses(["notice"])
106+
107+
cc_library(
108+
- name = "zstdlib",
109+
+ name = "zstd",
110+
srcs = glob([
111+
"common/*.c",
112+
"common/*.h",
113+
diff '--color=auto' -Nur a/third_party/xz.BUILD b/third_party/xz.BUILD
114+
--- a/third_party/xz.BUILD 2023-12-12 14:30:23.000000000 +0000
115+
+++ b/third_party/xz.BUILD 2025-04-30 17:04:01.399235585 +0000
116+
@@ -107,7 +107,7 @@
117+
)
118+
119+
cc_library(
120+
- name = "liblzma",
121+
+ name = "lzma",
122+
hdrs = [lzma_dir + "api/lzma.h"],
123+
strip_include_prefix = lzma_dir + "api",
124+
deps = ["liblzma_impl"],

‎third_party/riegeli/workspace.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ def repo():
3535
patches = [
3636
# Use absl crc32c rather than separate crc32c library.
3737
Label("//third_party:riegeli/patches/absl-crc32c.diff"),
38+
# zstd, bzip2, xz library names have changed.
39+
Label("//third_party:riegeli/patches/build.diff"),
3840
],
3941
repo_mapping = {
4042
"@net_zstd": "@zstd",

‎third_party/xz/system.BUILD.bazel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cc_library(
55
)
66

77
cc_library(
8-
name = "liblzma",
8+
name = "lzma",
99
linkopts = ["-llzma"],
1010
visibility = ["//visibility:public"],
1111
)

0 commit comments

Comments
 (0)