aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/Makefile
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2011-07-17 21:42:22 +0000
committerMartin Matuska <mm@FreeBSD.org>2011-07-17 21:42:22 +0000
commitf305d4bef730830f5f8fecdb27895974f17c1a6c (patch)
treee2aa60b473bd88d42e965988a7bd13041fd17954 /usr.bin/cpio/Makefile
parent2ad1419f1bb350900c182b8a1c673139c24e4060 (diff)
downloadsrc-f305d4bef730830f5f8fecdb27895974f17c1a6c.tar.gz
src-f305d4bef730830f5f8fecdb27895974f17c1a6c.zip
Update bsdcpio to 2.8.4
Use common code from lib/libarchive/libarchive_fe Approved by: kientzle MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=224154
Diffstat (limited to 'usr.bin/cpio/Makefile')
-rw-r--r--usr.bin/cpio/Makefile15
1 files changed, 11 insertions, 4 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index fe339cd99502..5868e5236cbe 100644
--- a/usr.bin/cpio/Makefile
+++ b/usr.bin/cpio/Makefile
@@ -3,17 +3,24 @@
.include <bsd.own.mk>
PROG= bsdcpio
-BSDCPIO_VERSION_STRING=2.8.3
-SRCS= cpio.c cmdline.c err.c line_reader.c matching.c pathmatch.c
+BSDCPIO_VERSION_STRING=2.8.4
+
+SRCS= cpio.c cmdline.c
+
+.PATH: ${.CURDIR}/../../lib/libarchive/libarchive_fe
+SRCS+= err.c line_reader.c matching.c pathmatch.c
+
CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\"
CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\"
+CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive/libarchive_fe
+
.ifdef RELEASE_CRUNCH
# FreeBSD's installer uses cpio in crunched binaries that are
# statically linked, cannot use -lcrypto, and are size sensitive.
CFLAGS+= -DSMALLER
.endif
-DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA}
-LDADD= -larchive -lz -lbz2 -lmd -llzma
+DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA} ${LIBBSDXML}
+LDADD= -larchive -lz -lbz2 -lmd -llzma -lbsdxml
.if ${MK_OPENSSL} != "no"
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto