From f9b1972a1b94cf12029696a5aac535c5dd780b16 Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Mon, 22 Apr 2024 12:06:13 +0200 Subject: [PATCH] riegeli@0.0.0-20231123-411cda7.bcr.1 (#1844) --- .../0.0.0-20231123-411cda7.bcr.1/MODULE.bazel | 62 ++++++++ .../patches/module_dot_bazel.patch | 65 +++++++++ .../patches/riegeli.patch | 135 ++++++++++++++++++ .../presubmit.yml | 26 ++++ .../0.0.0-20231123-411cda7.bcr.1/source.json | 10 ++ modules/riegeli/metadata.json | 7 +- 6 files changed, 303 insertions(+), 2 deletions(-) create mode 100644 modules/riegeli/0.0.0-20231123-411cda7.bcr.1/MODULE.bazel create mode 100644 modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/module_dot_bazel.patch create mode 100644 modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/riegeli.patch create mode 100644 modules/riegeli/0.0.0-20231123-411cda7.bcr.1/presubmit.yml create mode 100644 modules/riegeli/0.0.0-20231123-411cda7.bcr.1/source.json diff --git a/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/MODULE.bazel b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/MODULE.bazel new file mode 100644 index 0000000000..beb8da1016 --- /dev/null +++ b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/MODULE.bazel @@ -0,0 +1,62 @@ +module( + name = "riegeli", + version = "0.0.0-20231123-411cda7.bcr.1", + repo_name = "com_google_riegeli", +) + +bazel_dep( + name = "abseil-cpp", + version = "20220623.1", + repo_name = "com_google_absl", +) +bazel_dep( + name = "brotli", + version = "1.1.0", + repo_name = "org_brotli", +) +bazel_dep( + name = "bzip2", + version = "1.0.8", +) +bazel_dep( + name = "crc32c", + version = "1.1.0", +) +bazel_dep( + name = "highwayhash", + version = "0.0.0-20240305-5ad3bf8", +) +bazel_dep( + name = "lz4", + version = "1.9.4", +) +bazel_dep( + name = "platforms", + version = "0.0.9", +) +bazel_dep( + name = "protobuf", + version = "3.19.0", + repo_name = "com_google_protobuf", +) +bazel_dep( + name = "rules_proto", + version = "4.0.0", +) +bazel_dep( + name = "snappy", + version = "1.1.8", +) +bazel_dep( + name = "xz", + version = "5.4.5.bcr.1", +) +bazel_dep( + name = "zlib", + version = "1.2.11", +) +bazel_dep( + name = "zstd", + version = "1.5.6", + repo_name = "net_zstd", +) diff --git a/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/module_dot_bazel.patch b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/module_dot_bazel.patch new file mode 100644 index 0000000000..d6fa2f8e86 --- /dev/null +++ b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/module_dot_bazel.patch @@ -0,0 +1,65 @@ +--- a/MODULE.bazel ++++ a/MODULE.bazel +@@ -0,0 +1,62 @@ ++module( ++ name = "riegeli", ++ version = "0.0.0-20231123-411cda7.bcr.1", ++ repo_name = "com_google_riegeli", ++) ++ ++bazel_dep( ++ name = "abseil-cpp", ++ version = "20220623.1", ++ repo_name = "com_google_absl", ++) ++bazel_dep( ++ name = "brotli", ++ version = "1.1.0", ++ repo_name = "org_brotli", ++) ++bazel_dep( ++ name = "bzip2", ++ version = "1.0.8", ++) ++bazel_dep( ++ name = "crc32c", ++ version = "1.1.0", ++) ++bazel_dep( ++ name = "highwayhash", ++ version = "0.0.0-20240305-5ad3bf8", ++) ++bazel_dep( ++ name = "lz4", ++ version = "1.9.4", ++) ++bazel_dep( ++ name = "platforms", ++ version = "0.0.9", ++) ++bazel_dep( ++ name = "protobuf", ++ version = "3.19.0", ++ repo_name = "com_google_protobuf", ++) ++bazel_dep( ++ name = "rules_proto", ++ version = "4.0.0", ++) ++bazel_dep( ++ name = "snappy", ++ version = "1.1.8", ++) ++bazel_dep( ++ name = "xz", ++ version = "5.4.5.bcr.1", ++) ++bazel_dep( ++ name = "zlib", ++ version = "1.2.11", ++) ++bazel_dep( ++ name = "zstd", ++ version = "1.5.6", ++ repo_name = "net_zstd", ++) diff --git a/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/riegeli.patch b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/riegeli.patch new file mode 100644 index 0000000000..bb2687931d --- /dev/null +++ b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/patches/riegeli.patch @@ -0,0 +1,135 @@ +diff --git a/riegeli/bzip2/BUILD b/riegeli/bzip2/BUILD +index 7f98ce56..1ee2c169 100644 +--- a/riegeli/bzip2/BUILD ++++ b/riegeli/bzip2/BUILD +@@ -20,7 +20,7 @@ cc_library( + "//riegeli/bytes:buffer_options", + "//riegeli/bytes:buffered_reader", + "//riegeli/bytes:reader", +- "@bzip2//:bz2lib", ++ "@bzip2//:bz2", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", +@@ -42,7 +42,7 @@ cc_library( + "//riegeli/bytes:buffer_options", + "//riegeli/bytes:buffered_writer", + "//riegeli/bytes:writer", +- "@bzip2//:bz2lib", ++ "@bzip2//:bz2", + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", +@@ -56,7 +56,7 @@ cc_library( + visibility = ["//visibility:private"], + deps = [ + "//riegeli/base:assert", +- "@bzip2//:bz2lib", ++ "@bzip2//:bz2", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + ], +diff --git a/riegeli/lz4/BUILD b/riegeli/lz4/BUILD +index fb9a3446..bf7a06c2 100644 +--- a/riegeli/lz4/BUILD ++++ b/riegeli/lz4/BUILD +@@ -28,7 +28,7 @@ cc_library( + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", +- "@lz4", ++ "@lz4//:lz4_frame", + ], + ) + +@@ -57,7 +57,8 @@ cc_library( + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", +- "@lz4", ++ "@lz4//:lz4", ++ "@lz4//:lz4_frame", + ], + ) + +@@ -73,6 +74,6 @@ cc_library( + "//riegeli/base:intrusive_ref_count", + "@com_google_absl//absl/base", + "@com_google_absl//absl/strings", +- "@lz4", ++ "@lz4//:lz4_frame", + ], + ) +diff --git a/riegeli/lz4/lz4_reader.h b/riegeli/lz4/lz4_reader.h +index e7a57d11..d8ed7671 100644 +--- a/riegeli/lz4/lz4_reader.h ++++ b/riegeli/lz4/lz4_reader.h +@@ -36,7 +36,7 @@ + #include "riegeli/bytes/buffered_reader.h" + #include "riegeli/bytes/reader.h" + #include "riegeli/lz4/lz4_dictionary.h" // IWYU pragma: export +-#include "third_party/lz4/lib/lz4.h" ++#include "lz4.h" + + namespace riegeli { + +diff --git a/riegeli/xz/BUILD b/riegeli/xz/BUILD +index 9aaf5d54..1e85d753 100644 +--- a/riegeli/xz/BUILD ++++ b/riegeli/xz/BUILD +@@ -24,7 +24,7 @@ cc_library( + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", +- "@xz//:liblzma", ++ "@xz//:lzma", + ], + ) + +@@ -49,7 +49,7 @@ cc_library( + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", +- "@xz//:liblzma", ++ "@xz//:lzma", + ], + ) + +@@ -62,6 +62,6 @@ cc_library( + "//riegeli/base:assert", + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", +- "@xz//:liblzma", ++ "@xz//:lzma", + ], + ) +diff --git a/riegeli/zstd/BUILD b/riegeli/zstd/BUILD +index e7439cf2..f18b964e 100644 +--- a/riegeli/zstd/BUILD ++++ b/riegeli/zstd/BUILD +@@ -28,7 +28,7 @@ cc_library( + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", +- "@net_zstd//:zstdlib", ++ "@net_zstd//:zstd", + ], + ) + +@@ -57,7 +57,7 @@ cc_library( + "@com_google_absl//absl/status", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/types:optional", +- "@net_zstd//:zstdlib", ++ "@net_zstd//:zstd", + ], + ) + +@@ -76,6 +76,6 @@ cc_library( + "@com_google_absl//absl/base:core_headers", + "@com_google_absl//absl/strings", + "@com_google_absl//absl/synchronization", +- "@net_zstd//:zstdlib", ++ "@net_zstd//:zstd", + ], + ) diff --git a/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/presubmit.yml b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/presubmit.yml new file mode 100644 index 0000000000..bb076aad07 --- /dev/null +++ b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/presubmit.yml @@ -0,0 +1,26 @@ +matrix: + platform: + - debian10 + - ubuntu2004 + bazel: + - 7.x + - 6.x +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_flags: + - '--cxxopt=-std=c++17' + build_targets: + - '@riegeli//riegeli/base/...' + - '@riegeli//riegeli/brotli/...' + - '@riegeli//riegeli/bytes/...' + - '@riegeli//riegeli/bzip2/...' + - '@riegeli//riegeli/lz4/...' + - '@riegeli//riegeli/records:record_reader' + - '@riegeli//riegeli/records:record_writer' + - '@riegeli//riegeli/snappy/...' + - '@riegeli//riegeli/xz/...' + - '@riegeli//riegeli/zlib/...' + - '@riegeli//riegeli/zstd/...' diff --git a/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/source.json b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/source.json new file mode 100644 index 0000000000..55e1b193ae --- /dev/null +++ b/modules/riegeli/0.0.0-20231123-411cda7.bcr.1/source.json @@ -0,0 +1,10 @@ +{ + "url": "https://github.com/google/riegeli/archive/411cda7f6aa81f8b8591b04cf141b1decdcc928c.tar.gz", + "integrity": "sha256-+DhuROFtBEwdcVHAtVO7cHXXlYPU+p5hOkvkUlmeB5U=", + "strip_prefix": "riegeli-411cda7f6aa81f8b8591b04cf141b1decdcc928c", + "patches": { + "riegeli.patch": "sha256-KJ78Ha2MGe4s10446SfQ2oSaqu9nHtMDlvRWliWlPm4=", + "module_dot_bazel.patch": "sha256-VqcF8ZfsgPaJOkh6KYA1FQms5L1NF04y7CIZX88aok8=" + }, + "patch_strip": 1 +} diff --git a/modules/riegeli/metadata.json b/modules/riegeli/metadata.json index c4d1b90f58..9276be0e64 100644 --- a/modules/riegeli/metadata.json +++ b/modules/riegeli/metadata.json @@ -10,7 +10,10 @@ "github:google/riegeli" ], "versions": [ - "0.0.0-20231123-411cda7" + "0.0.0-20231123-411cda7", + "0.0.0-20231123-411cda7.bcr.1" ], - "yanked_versions": {} + "yanked_versions": { + "0.0.0-20231123-411cda7": "use riegeli@0.0.0-20231123-411cda7.bcr.1 instead" + } }