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 /lib/libarchive | |
| 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 'lib/libarchive')
| -rw-r--r-- | lib/libarchive/Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/libarchive/Makefile b/lib/libarchive/Makefile index 8de8247..9470190 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 |
