summaryrefslogtreecommitdiffstats
path: root/lib/liblzma/Makefile
diff options
context:
space:
mode:
authorrpaulo <rpaulo@FreeBSD.org>2015-02-09 06:20:34 +0000
committerrpaulo <rpaulo@FreeBSD.org>2015-02-09 06:20:34 +0000
commit5c135511438bd7d3cfd1573f341fe8323603e2da (patch)
tree3f25b66f5b10f61bdad6d2e1065d6babc4b9bc85 /lib/liblzma/Makefile
parent0e8f15c1955b01cf082fe6bc42d4376daeac3f73 (diff)
parent82958f097ff3e2aaf6e956f5bb76ec6cd7225ab2 (diff)
downloadFreeBSD-src-5c135511438bd7d3cfd1573f341fe8323603e2da.zip
FreeBSD-src-5c135511438bd7d3cfd1573f341fe8323603e2da.tar.gz
Merge xz 5.2.0.
This brings support for multi-threaded compression. This brings close N times faster compression where N is the number of CPU cores. Because of this, liblzma now depends on libthr. Soon libarchive will be modified to use the new lzma API. Thanks to antoine@ for the exp-run. Differential Revision: https://reviews.freebsd.org/D1786 Reviewed by: bapt
Diffstat (limited to 'lib/liblzma/Makefile')
-rw-r--r--lib/liblzma/Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile
index 2229194..39b929f 100644
--- a/lib/liblzma/Makefile
+++ b/lib/liblzma/Makefile
@@ -4,7 +4,7 @@ LIB= lzma
LZMADIR= ${.CURDIR}/../../contrib/xz/src/liblzma
.PATH: ${LZMADIR}/../common
-SRCS+= tuklib_physmem.c
+SRCS+= tuklib_physmem.c tuklib_cpucores.c
.PATH: ${LZMADIR}/api/lzma
@@ -21,7 +21,7 @@ LZMAINCS+= base.h \
hardware.h \
index.h \
index_hash.h \
- lzma.h \
+ lzma12.h \
stream_flags.h \
version.h \
vli.h
@@ -36,6 +36,7 @@ SRCS+= common.c \
easy_preset.c \
filter_common.c \
hardware_physmem.c \
+ hardware_cputhreads.c \
index.c \
stream_flags_common.c \
vli_size.c \
@@ -68,7 +69,10 @@ SRCS+= common.c \
stream_buffer_decoder.c \
stream_decoder.c \
stream_flags_decoder.c \
- vli_decoder.c
+ stream_encoder_mt.c \
+ vli_decoder.c \
+ outqueue.c
+
.PATH: ${LZMADIR}/check
SRCS+= check.c \
@@ -142,6 +146,8 @@ CFLAGS+= -DHAVE_CONFIG_H \
-I${LZMADIR}/simple \
-I${LZMADIR}/../common
+LIBADD+= pthread
+
VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
CFLAGS+= -DSYMBOL_VERSIONING
OpenPOWER on IntegriCloud