Merge pull request #319 from Vertexwahn/update-xz

Update xz util lib to 5.4.0

.gitignore

@@ -1 +1,2 @@
-bazel-*
+/bazel-*
+.DS_Store

BUILD.lzma

@@ -52,98 +52,11 @@ alias(
 cc_library(
     name = "lzma",
     srcs = [
+        "src/liblzma/api/config.h", # Generated, so missed by glob.
         "src/common/tuklib_cpucores.c",
         "src/common/tuklib_physmem.c",
-        "src/liblzma/check/check.c",
-        "src/liblzma/check/crc32_fast.c",
-        "src/liblzma/check/crc32_table.c",
-        "src/liblzma/check/crc64_fast.c",
-        "src/liblzma/check/crc64_table.c",
-        "src/liblzma/check/sha256.c",
-        "src/liblzma/common/alone_decoder.c",
-        "src/liblzma/common/alone_encoder.c",
-        "src/liblzma/common/auto_decoder.c",
-        "src/liblzma/common/block_buffer_decoder.c",
-        "src/liblzma/common/block_buffer_encoder.c",
-        "src/liblzma/common/block_decoder.c",
-        "src/liblzma/common/block_encoder.c",
-        "src/liblzma/common/block_header_decoder.c",
-        "src/liblzma/common/block_header_encoder.c",
-        "src/liblzma/common/block_util.c",
-        "src/liblzma/common/common.c",
-        "src/liblzma/common/easy_buffer_encoder.c",
-        "src/liblzma/common/easy_decoder_memusage.c",
-        "src/liblzma/common/easy_encoder.c",
-        "src/liblzma/common/easy_encoder_memusage.c",
-        "src/liblzma/common/easy_preset.c",
-        "src/liblzma/common/filter_buffer_decoder.c",
-        "src/liblzma/common/filter_buffer_encoder.c",
-        "src/liblzma/common/filter_common.c",
-        "src/liblzma/common/filter_decoder.c",
-        "src/liblzma/common/filter_encoder.c",
-        "src/liblzma/common/filter_flags_decoder.c",
-        "src/liblzma/common/filter_flags_encoder.c",
-        "src/liblzma/common/hardware_cputhreads.c",
-        "src/liblzma/common/hardware_physmem.c",
-        "src/liblzma/common/index.c",
-        "src/liblzma/common/index_decoder.c",
-        "src/liblzma/common/index_encoder.c",
-        "src/liblzma/common/index_hash.c",
-        "src/liblzma/common/outqueue.c",
-        "src/liblzma/common/stream_buffer_decoder.c",
-        "src/liblzma/common/stream_buffer_encoder.c",
-        "src/liblzma/common/stream_decoder.c",
-        "src/liblzma/common/stream_encoder.c",
-        "src/liblzma/common/stream_encoder_mt.c",
-        "src/liblzma/common/stream_flags_common.c",
-        "src/liblzma/common/stream_flags_decoder.c",
-        "src/liblzma/common/stream_flags_encoder.c",
-        "src/liblzma/common/vli_decoder.c",
-        "src/liblzma/common/vli_encoder.c",
-        "src/liblzma/common/vli_size.c",
-        "src/liblzma/delta/delta_common.c",
-        "src/liblzma/delta/delta_decoder.c",
-        "src/liblzma/delta/delta_encoder.c",
-        "src/liblzma/lz/lz_decoder.c",
-        "src/liblzma/lz/lz_encoder.c",
-        "src/liblzma/lz/lz_encoder_mf.c",
-        "src/liblzma/lzma/fastpos_table.c",
-        "src/liblzma/lzma/lzma2_decoder.c",
-        "src/liblzma/lzma/lzma2_encoder.c",
-        "src/liblzma/lzma/lzma_decoder.c",
-        "src/liblzma/lzma/lzma_encoder.c",
-        "src/liblzma/lzma/lzma_encoder_optimum_fast.c",
-        "src/liblzma/lzma/lzma_encoder_optimum_normal.c",
-        "src/liblzma/lzma/lzma_encoder_presets.c",
-        "src/liblzma/rangecoder/price_table.c",
-        "src/liblzma/simple/arm.c",
-        "src/liblzma/simple/armthumb.c",
-        "src/liblzma/simple/ia64.c",
-        "src/liblzma/simple/powerpc.c",
-        "src/liblzma/simple/simple_coder.c",
-        "src/liblzma/simple/simple_decoder.c",
-        "src/liblzma/simple/simple_encoder.c",
-        "src/liblzma/simple/sparc.c",
-        "src/liblzma/simple/x86.c",
-        "src/liblzma/api/config.h",
-    ] + glob(["src/**/*.h"]),
-    hdrs = [
-        "src/liblzma/api/lzma.h",
-        "src/liblzma/api/lzma/base.h",
-        "src/liblzma/api/lzma/bcj.h",
-        "src/liblzma/api/lzma/block.h",
-        "src/liblzma/api/lzma/check.h",
-        "src/liblzma/api/lzma/container.h",
-        "src/liblzma/api/lzma/delta.h",
-        "src/liblzma/api/lzma/filter.h",
-        "src/liblzma/api/lzma/hardware.h",
-        "src/liblzma/api/lzma/index.h",
-        "src/liblzma/api/lzma/index_hash.h",
-        "src/liblzma/api/lzma/lzma12.h",
-        "src/liblzma/api/lzma/stream_flags.h",
-        "src/liblzma/api/lzma/version.h",
-        "src/liblzma/api/lzma/vli.h",
-    ],
+    ] + glob(["src/**/*.h", "src/liblzma/**/*.c"], exclude = ["src/liblzma/check/crc*_small.c", "src/liblzma/**/*_tablegen.c"]),
+    hdrs = glob(["src/liblzma/api/**/*.h"]),
     copts = select({
         "@platforms//os:windows": [],
         "//conditions:default": ["-std=c99"],

BUILD.zstd

@@ -14,7 +14,8 @@ cc_library(
         "lib/legacy/*.h",
         "lib/legacy/*.c",
     ]) + select({
-        ":linux_x86_64": ["lib/decompress/huf_decompress_amd64.S"],
+        "@platforms//cpu:x86_64": ["lib/decompress/huf_decompress_amd64.S"],
+        ":windows_x86_64": [],
         "//conditions:default": [],
     }),
     hdrs = [
@@ -37,9 +38,9 @@ cc_library(
 # Hopefully, the need for these OSxCPU config_setting()s will be obviated by a fix to https://github.com/bazelbuild/platforms/issues/36
 
 config_setting(
-    name = "linux_x86_64",
+    name = "windows_x86_64",
     constraint_values = [
-        "@platforms//os:linux",
+        "@platforms//os:windows",
         "@platforms//cpu:x86_64",
     ],
 )

boost/boost.bzl

@@ -184,10 +184,10 @@ def boost_deps():
         http_archive,
         name = "org_lzma_lzma",
         build_file = "@com_github_nelhage_rules_boost//:BUILD.lzma",
-        sha256 = "06327c2ddc81e126a6d9a78b0be5014b976a2c0832f492dcfc4755d7facf6d33",
-        strip_prefix = "xz-5.2.7",
+        sha256 = "e4b0f81582efa155ccf27bb88275254a429d44968e488fc94b806f2a61cd3e22",
+        strip_prefix = "xz-5.4.1",
         urls = [
-            "https://%s.dl.sourceforge.net/project/lzmautils/xz-5.2.7.tar.gz" % m
+            "https://%s.dl.sourceforge.net/project/lzmautils/xz-5.4.1.tar.gz" % m
             for m in SOURCEFORGE_MIRRORS
         ],
     )