mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

configure.ac: check if lzma has MT support, fix deb build/etc.

Browse source
This commit is contained in:
Will Dietz 2018-02-09 20:57:31 -06:00
parent 960e9c560e
commit 5a082ad15a
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -175,6 +175,8 @@ AC_SUBST(HAVE_SODIUM, [$have_sodium])
# Look for liblzma, a required dependency. # Look for liblzma, a required dependency.
PKG_CHECK_MODULES([LIBLZMA], [liblzma], [CXXFLAGS="$LIBLZMA_CFLAGS $CXXFLAGS"]) PKG_CHECK_MODULES([LIBLZMA], [liblzma], [CXXFLAGS="$LIBLZMA_CFLAGS $CXXFLAGS"])
AC_CHECK_LIB([lzma], [lzma_stream_encoder_mt],
[AC_DEFINE([HAVE_LZMA_MT], [1], [xz multithreaded compression support])])
# Look for libbrotli{enc,dec}, optional dependencies # Look for libbrotli{enc,dec}, optional dependencies

2
src/libutil/compression.cc
View file

@ -192,6 +192,7 @@ struct XzSink : CompressionSink
XzSink(Sink & nextSink, const bool parallel) : nextSink(nextSink) XzSink(Sink & nextSink, const bool parallel) : nextSink(nextSink)
{ {
lzma_ret ret; lzma_ret ret;
#ifdef HAVE_LZMA_MT
if (parallel) { if (parallel) {
lzma_mt mt_options = {}; lzma_mt mt_options = {};
mt_options.flags = 0; mt_options.flags = 0;
@ -208,6 +209,7 @@ struct XzSink : CompressionSink
ret = lzma_stream_encoder_mt( ret = lzma_stream_encoder_mt(
&strm, &mt_options); &strm, &mt_options);
} else } else
#endif
ret = lzma_easy_encoder( ret = lzma_easy_encoder(
&strm, 6, LZMA_CHECK_CRC64); &strm, 6, LZMA_CHECK_CRC64);