Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add xz 5.4.5.bcr.2 #1895

Merged
merged 4 commits into from
Apr 27, 2024
Merged

Add xz 5.4.5.bcr.2 #1895

merged 4 commits into from
Apr 27, 2024

Conversation

keith
Copy link
Member

@keith keith commented Apr 27, 2024

This fixes compatibility with incompatible_disallow_empty_glob

This fixes compatibility with incompatible_disallow_empty_glob
@bazel-io
Copy link
Member

Hello @Attempt3035, @Vertexwahn, modules you maintain (xz) have been updated in this PR. Please review the changes.

@keith
Copy link
Member Author

keith commented Apr 27, 2024

Here's the diff from the previous patch:

--- 5.4.5.bcr.1/patches/patch.diff	2024-03-20 14:32:09
+++ 5.4.5.bcr.2/patches/patch.diff	2024-04-27 11:00:45
@@ -1,9 +1,9 @@
 diff --git a/BUILD.bazel b/BUILD.bazel
 new file mode 100644
-index 0000000..0cd0bfe
+index 00000000..ec299a3d
 --- /dev/null
 +++ b/BUILD.bazel
-@@ -0,0 +1,372 @@
+@@ -0,0 +1,365 @@
 +# Description
 +#    lzma is a general purpose data compression library https://tukaani.org/xz/
 +#    Public Domain
@@ -139,7 +139,6 @@
 +    visibility = ["//visibility:public"],
 +    deps = [
 +        "//:lzma_src_common",
-+        "//:lzma_src_liblzma",
 +        "//:lzma_src_liblzma_api",
 +        "//:lzma_src_liblzma_check",
 +        "//:lzma_src_liblzma_common",
@@ -251,12 +250,6 @@
 +)
 +
 +cc_library(
-+    name = "lzma_src_liblzma",
-+    hdrs = glob(["src/liblzma/*.h"]),
-+    strip_include_prefix = "src/liblzma",
-+)
-+
-+cc_library(
 +    name = "lzma_src_liblzma_api",
 +    hdrs = [
 +        "src/liblzma/api/config.h",  # Generated above, so missed by glob. In srcs so it's not public like the other headers
@@ -367,7 +360,7 @@
 +    copts = [
 +        "-fsanitize=fuzzer",
 +    ],
-+    data = glob(["files/**"]),
++    data = glob(["tests/files/**"]),
 +    linkopts = [
 +        "-fsanitize=fuzzer",
 +    ],

@keith keith added the presubmit-auto-run Presubmit jobs will be triggered for new changes automatically without reviewer's approval label Apr 27, 2024
@keith keith enabled auto-merge (squash) April 27, 2024 15:09
@keith keith merged commit 57ec914 into main Apr 27, 2024
40 checks passed
@keith keith deleted the ks/add-xz-5.4.5.bcr.2 branch April 27, 2024 17:26
aiuto pushed a commit to aiuto/bazel-central-registry that referenced this pull request Jun 3, 2024
This fixes compatibility with incompatible_disallow_empty_glob
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
presubmit-auto-run Presubmit jobs will be triggered for new changes automatically without reviewer's approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants