This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=cc80b8be4a35874aaaefad72ffe4e2c894ed65d4 commit cc80b8be4a35874aaaefad72ffe4e2c894ed65d4 Author: Guillem Jover <[email protected]> AuthorDate: Sat Jun 19 22:18:07 2021 +0200 build: Rename HAVE_LZMA_MT to HAVE_LZMA_MT_ENCODER This macro describes whether liblzma has support for multi-threaded compression, but we'll want to check for the upcoming decompression too, which is not going to be supported by the same versions. --- lib/dpkg/compress.c | 4 ++-- m4/dpkg-libs.m4 | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/dpkg/compress.c b/lib/dpkg/compress.c index 3a264d399..d26922647 100644 --- a/lib/dpkg/compress.c +++ b/lib/dpkg/compress.c @@ -543,7 +543,7 @@ filter_xz_init(struct io_lzma *io, lzma_stream *s) { uint32_t preset; lzma_check check = LZMA_CHECK_CRC64; -#ifdef HAVE_LZMA_MT +#ifdef HAVE_LZMA_MT_ENCODER uint64_t mt_memlimit; lzma_mt mt_options = { .flags = 0, @@ -561,7 +561,7 @@ filter_xz_init(struct io_lzma *io, lzma_stream *s) if (io->params->strategy == COMPRESSOR_STRATEGY_EXTREME) preset |= LZMA_PRESET_EXTREME; -#ifdef HAVE_LZMA_MT +#ifdef HAVE_LZMA_MT_ENCODER mt_options.preset = preset; /* Initialize the multi-threaded memory limit to half the physical diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4 index 2c301ebca..08abb0f3a 100644 --- a/m4/dpkg-libs.m4 +++ b/m4/dpkg-libs.m4 @@ -94,7 +94,8 @@ AC_DEFUN([DPKG_LIB_Z], [ AC_DEFUN([DPKG_LIB_LZMA], [ DPKG_WITH_COMPRESS_LIB([lzma], [lzma.h], [lzma_alone_decoder]) AC_CHECK_LIB([lzma], [lzma_stream_encoder_mt], [ - AC_DEFINE([HAVE_LZMA_MT], [1], [xz multithreaded compression support]) + AC_DEFINE([HAVE_LZMA_MT_ENCODER], [1], + [xz multithreaded compression support]) ]) ])# DPKG_LIB_LZMA -- Dpkg.Org's dpkg
