diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2015-02-09 06:20:34 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2015-02-09 06:20:34 +0000 |
| commit | 5c135511438bd7d3cfd1573f341fe8323603e2da (patch) | |
| tree | 3f25b66f5b10f61bdad6d2e1065d6babc4b9bc85 /rescue | |
| parent | 0e8f15c1955b01cf082fe6bc42d4376daeac3f73 (diff) | |
| parent | 82958f097ff3e2aaf6e956f5bb76ec6cd7225ab2 (diff) | |
| download | FreeBSD-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 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index cb4422d..7f123a8 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -120,9 +120,12 @@ CRUNCH_PROGS_usr.sbin+= zdb # crunchgen does not like C++ programs; this should be fixed someday # CRUNCH_PROGS+= devd -CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec +CRUNCH_LIBS+= -lalias -lcam -lncursesw -ldevstat -lipsec -llzma .if ${MK_ZFS} != "no" CRUNCH_LIBS+= -lavl -lzpool -lzfs_core -lzfs -lnvpair -lpthread -luutil -lumem +.else +# liblzma needs pthread +CRUNCH_LIBS+= -lpthread .endif CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv .if ${MK_OPENSSL} == "no" @@ -190,7 +193,6 @@ CRUNCH_ALIAS_less= more CRUNCH_PROGS_usr.bin+= xz CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat -CRUNCH_LIBS+= -llzma CRUNCH_PROGS_usr.bin+= tar CRUNCH_LIBS+= -larchive |
