summaryrefslogtreecommitdiffstats
path: root/rescue
diff options
context:
space:
mode:
authordelphij <delphij@FreeBSD.org>2015-12-22 08:03:23 +0000
committerdelphij <delphij@FreeBSD.org>2015-12-22 08:03:23 +0000
commit897a072717635ed1cdd491bcd112147e58f4de0d (patch)
treefc6400160a194c6ade31da57ec01557fc22c87fa /rescue
parent1515aec4ed9737a7508ecb3f30d50e49a4e90015 (diff)
downloadFreeBSD-src-897a072717635ed1cdd491bcd112147e58f4de0d.zip
FreeBSD-src-897a072717635ed1cdd491bcd112147e58f4de0d.tar.gz
MFC: xz 5.2.2.
Relnotes: yes
Diffstat (limited to 'rescue')
-rw-r--r--rescue/rescue/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 9b99141..04aae98 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -120,12 +120,15 @@ CRUNCH_PROGS_usr.sbin+= zdb
# crunchgen does not like C++ programs; this should be fixed someday
# CRUNCH_PROGS+= devd
-CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec
+CRUNCH_LIBS+= -lalias -lcam -lcurses -ldevstat -lipsec -llzma
.if ${MK_IPX} != "no"
CRUNCH_LIBS+= -lipx
.endif
.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"
@@ -197,7 +200,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
OpenPOWER on IntegriCloud