diff options
| author | mm <mm@FreeBSD.org> | 2010-05-10 15:28:44 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-05-10 15:28:44 +0000 |
| commit | 696cb260785255c3d695ac1371cc62921a8b7d39 (patch) | |
| tree | 746d4e55845e35b6cc113fa5d2a1a4db84ed8204 /usr.bin/cpio | |
| parent | 4ca9a130c3852e200cb06a9295498674091e4145 (diff) | |
| download | FreeBSD-src-696cb260785255c3d695ac1371cc62921a8b7d39.zip FreeBSD-src-696cb260785255c3d695ac1371cc62921a8b7d39.tar.gz | |
Enable liblzma support in libarchive
Adjust dependencies for programs using libarchive
Add xz and linkage against liblzma to rescue system
Approved by: kientzle, delphij (mentor)
MFC after: 2 weeks
Diffstat (limited to 'usr.bin/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/cpio/test/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 80cf1fa..fe339cd 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 ace9516..111864e 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} |
