diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2012-07-28 06:38:44 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2012-07-28 06:38:44 +0000 |
| commit | fd082e96c469d04c399fc0556f40cb7152ee9148 (patch) | |
| tree | 1ed0c7ff98605ecfbedcfa8d00cd1a29e2dfebe6 /usr.bin/cpio | |
| parent | 79607afe3ebfa8d9536ac4def7a347c9ab971dd0 (diff) | |
| parent | 81418b36c02b6434acd4b8ae4cfb8c80a3742fd4 (diff) | |
| download | src-fd082e96c469d04c399fc0556f40cb7152ee9148.tar.gz src-fd082e96c469d04c399fc0556f40cb7152ee9148.zip | |
Update libarchive to 3.0.4
Notes
Notes:
svn path=/head/; revision=238856
Diffstat (limited to 'usr.bin/cpio')
| -rw-r--r-- | usr.bin/cpio/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/cpio/test/Makefile | 11 |
2 files changed, 7 insertions, 8 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 13579c11ad6b..d1a3cca73778 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -6,13 +6,13 @@ LIBARCHIVEDIR= ${.CURDIR}/../../contrib/libarchive LIBARCHIVECONFDIR= ${.CURDIR}/../../lib/libarchive PROG= bsdcpio -BSDCPIO_VERSION_STRING= 3.0.3 +BSDCPIO_VERSION_STRING= 3.0.4 .PATH: ${LIBARCHIVEDIR}/cpio SRCS= cpio.c cmdline.c .PATH: ${LIBARCHIVEDIR}/libarchive_fe -SRCS+= err.c line_reader.c matching.c pathmatch.c +SRCS+= err.c line_reader.c CFLAGS+= -DBSDCPIO_VERSION_STRING=\"${BSDCPIO_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"${LIBARCHIVECONFDIR}/config_freebsd.h\" diff --git a/usr.bin/cpio/test/Makefile b/usr.bin/cpio/test/Makefile index 1da6b1c074a2..3a17f8ed0ad3 100644 --- a/usr.bin/cpio/test/Makefile +++ b/usr.bin/cpio/test/Makefile @@ -6,7 +6,7 @@ LIBARCHIVEDIR= ${.CURDIR}/../../../contrib/libarchive CPIO_SRCS= cmdline.c .PATH: ${LIBARCHIVEDIR}/libarchive_fe -CPIO_SRCS+= err.c pathmatch.c +CPIO_SRCS+= err.c .PATH: ${LIBARCHIVEDIR}/cpio/test TESTS= \ @@ -35,8 +35,7 @@ TESTS= \ test_option_z.c \ test_owner_parse.c \ test_passthrough_dotdot.c \ - test_passthrough_reverse.c \ - test_pathmatch.c + test_passthrough_reverse.c # Build the test program SRCS= list.h \ @@ -50,8 +49,8 @@ NO_MAN=yes PROG=bsdcpio_test DPADD=${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} -CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../config_freebsd.h\" -CFLAGS+= -I${.CURDIR}/.. +CFLAGS+= -DPLATFORM_CONFIG_H=\"${.CURDIR}/../../../lib/libarchive/config_freebsd.h\" +CFLAGS+= -I${.CURDIR}/../../../lib/libarchive -I${.OBJDIR} LDADD= -larchive -lz -lbz2 -llzma #CFLAGS+= -static -g -O2 -Wall CFLAGS+= -g -O2 -Wall @@ -74,6 +73,6 @@ clean: rm -f ${CLEANFILES} rm -f *~ -chmod -R +w /tmp/bsdcpio_test.* - rm -rf /tmp/bsdcpio_test + rm -rf /tmp/bsdcpio_test.* .include <bsd.prog.mk> |