From 696cb260785255c3d695ac1371cc62921a8b7d39 Mon Sep 17 00:00:00 2001
From: mm <mm@FreeBSD.org>
Date: Mon, 10 May 2010 15:28:44 +0000
Subject: 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
---
 usr.bin/ar/Makefile        | 4 ++--
 usr.bin/cpio/Makefile      | 4 ++--
 usr.bin/cpio/test/Makefile | 4 ++--
 usr.bin/tar/Makefile       | 4 ++--
 usr.bin/tar/test/Makefile  | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'usr.bin')

diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile
index 1f00aca..57ff447 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 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}
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile
index 3d782c5..4b0d186 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 3880be0..9babcfa 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}
-- 
cgit v1.1