diff options
| author | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 65145fa4c81da358fcbc3b650156dab705dfa34e (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /usr.bin/tar | |
| parent | 60ff4eb0dff94a04d75d0d52a3957aaaf5f8c693 (diff) | |
| parent | e6b664c390af88d4a87208bc042ce503da664c3b (diff) | |
| download | FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.zip FreeBSD-src-65145fa4c81da358fcbc3b650156dab705dfa34e.tar.gz | |
Merge sync of head
Diffstat (limited to 'usr.bin/tar')
| -rw-r--r-- | usr.bin/tar/Makefile | 11 | ||||
| -rw-r--r-- | usr.bin/tar/Makefile.depend | 1 |
2 files changed, 2 insertions, 10 deletions
diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index a289ea4..e8a9ad4 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -19,15 +19,7 @@ SRCS= bsdtar.c \ SRCS+= err.c \ line_reader.c -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBLZMA} ${LIBBSDXML} -LDADD= -larchive -lbz2 -lz -llzma -lbsdxml -.if ${MK_OPENSSL} != "no" -DPADD+= ${LIBCRYPTO} -LDADD+= -lcrypto -.else -DPADD+= ${LIBMD} -LDADD+= -lmd -.endif +LIBADD= archive .if ${MK_ICONV} != "no" CFLAGS+= -DHAVE_ICONV=1 -DHAVE_ICONV_H=1 -DICONV_CONST=const @@ -39,7 +31,6 @@ CFLAGS+= -I${LIBARCHIVEDIR}/tar -I${LIBARCHIVEDIR}/libarchive CFLAGS+= -I${LIBARCHIVEDIR}/libarchive_fe SYMLINKS= bsdtar ${BINDIR}/tar MLINKS= bsdtar.1 tar.1 -DEBUG_FLAGS=-g .PHONY: check test clean-test check test: $(PROG) bsdtar.1.gz diff --git a/usr.bin/tar/Makefile.depend b/usr.bin/tar/Makefile.depend index 7f1d531..52fc11f 100644 --- a/usr.bin/tar/Makefile.depend +++ b/usr.bin/tar/Makefile.depend @@ -14,6 +14,7 @@ DIRDEPS = \ lib/libcompiler_rt \ lib/libexpat \ lib/liblzma \ + lib/libthr \ lib/libz \ secure/lib/libcrypto \ |
