aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.inc12
-rw-r--r--lib/libarchive/Makefile9
-rw-r--r--rescue/rescue/Makefile4
-rw-r--r--usr.bin/ar/Makefile4
-rw-r--r--usr.bin/cpio/Makefile4
-rw-r--r--usr.bin/cpio/test/Makefile4
-rw-r--r--usr.bin/tar/Makefile4
-rw-r--r--usr.bin/tar/test/Makefile4
8 files changed, 18 insertions, 17 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1
index df4604aeb712..6342de4bea04 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1113,7 +1113,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} ${_kerberos5_lib_libheimntlm} \
lib/libbz2 lib/libcom_err lib/libcrypt \
lib/libexpat lib/libfetch \
${_lib_libgssapi} ${_lib_libipx} \
- lib/libkiconv lib/libkvm lib/libmd \
+ lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
lib/libradius lib/libsbuf lib/libtacplus \
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile
index 8de8247b64df..9470190a2e54 100644
--- a/lib/libarchive/Makefile
+++ b/lib/libarchive/Makefile
@@ -2,8 +2,8 @@
.include <bsd.own.mk>
LIB= archive
-DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD}
-LDADD= -lbz2 -lz -lmd
+DPADD= ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
+LDADD= -lbz2 -lz -lmd -llzma
# FreeBSD SHLIB_MAJOR value is managed as part of the FreeBSD system.
# It has no real relation to the libarchive version number.
@@ -11,10 +11,7 @@ SHLIB_MAJOR= 5
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I${.OBJDIR}
-#Uncomment to build with full lzma/xz support via liblzma
-#liblzma is not (yet?) part of the FreeBSD base system
-#CFLAGS+= -I/usr/local/include -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
-#LDADD+= -L/usr/local/lib -llzma
+CFLAGS+= -DHAVE_LIBLZMA=1 -DHAVE_LZMA_H=1
.if ${MK_OPENSSL} != "no"
CFLAGS+= -DWITH_OPENSSL
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index afb15b09404a..d62b6f45cec7 100644
--- a/rescue/rescue/Makefile
+++ b/rescue/rescue/Makefile
@@ -208,6 +208,10 @@ CRUNCH_PROGS_usr.bin+= bzip2
CRUNCH_ALIAS_bzip2= bunzip2 bzcat
CRUNCH_LIBS+= -lbz2
+CRUNCH_PROGS_usr.bin+= xz
+CRUNCH_ALIAS_xz= unxz lzma unlzma xzcat lzcat
+CRUNCH_LIBS+= -llzma
+
CRUNCH_PROGS_usr.bin+= tar
CRUNCH_LIBS+= -larchive -lmd
.if ${MK_OPENSSL} != "no"
diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 1f00aca1984e..57ff44705225 100644
--- a/usr.bin/ar/Makefile
+++ b/usr.bin/ar/Makefile
@@ -3,8 +3,8 @@
PROG= ar
SRCS= ar.c acplex.l acpyacc.y read.c util.c write.c y.tab.h
-DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBELF}
-LDADD= -larchive -lbz2 -lz -lelf
+DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBELF}
+LDADD= -larchive -lbz2 -lz -llzma -lelf
CFLAGS+=-I. -I${.CURDIR}
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index 80cf1fa55ef6..fe339cd99502 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -12,8 +12,8 @@ CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
# statically linked, cannot use -lcrypto, and are size sensitive.
CFLAGS+= -DSMALLER
.endif
-DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD}
-LDADD= -larchive -lz -lbz2 -lmd
+DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA}
+LDADD= -larchive -lz -lbz2 -lmd -llzma
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile
index ace951698010..111864ee94ac 100644
--- a/usr.bin/cpio/test/Makefile
+++ b/usr.bin/cpio/test/Makefile
@@ -42,10 +42,10 @@ CLEANFILES+= list.h bsdcpio_test
NO_MAN=yes
PROG=bsdcpio_test
-DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
+DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I..
-LDADD= -larchive -lz -lbz2
+LDADD= -larchive -lz -lbz2 -llzma
CFLAGS+= -static -g -O2 -Wall
CFLAGS+= -I${.OBJDIR}
CFLAGS+= -I${CPIO_SRCDIR}
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 3d782c5cd341..4b0d186d21c4 100644
--- a/usr.bin/tar/Makefile
+++ b/usr.bin/tar/Makefile
@@ -15,8 +15,8 @@ SRCS= bsdtar.c \
tree.c \
util.c \
write.c
-DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD}
-LDADD= -larchive -lbz2 -lz -lmd
+DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA}
+LDADD= -larchive -lbz2 -lz -lmd -llzma
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
diff --git a/usr.bin/tar/test/Makefile b/usr.bin/tar/test/Makefile
index 3880be051d2a..9babcfa7c29d 100644
--- a/usr.bin/tar/test/Makefile
+++ b/usr.bin/tar/test/Makefile
@@ -34,10 +34,10 @@ CLEANFILES+= list.h
NO_MAN=yes
PROG=bsdtar_test
-DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ}
+DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA}
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
CFLAGS+= -I..
-LDADD= -larchive -lz -lbz2
+LDADD= -larchive -lz -lbz2 -llzma
CFLAGS+= -static -g -O2 -Wall
CFLAGS+= -I${.OBJDIR}
CFLAGS+= -I${TAR_SRCDIR}