diff options
| author | mm <mm@FreeBSD.org> | 2011-08-01 08:22:40 +0000 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2011-08-01 08:22:40 +0000 |
| commit | 349e291a0a5aabbf5f59713cb6ee333032132650 (patch) | |
| tree | a31cd59b8392d9ed6c52d9604f5f561d9ecd34d8 /usr.bin | |
| parent | 6ce53b0b08a31f8c1ccbb87ce659b8eca4b70f73 (diff) | |
| download | FreeBSD-src-349e291a0a5aabbf5f59713cb6ee333032132650.zip FreeBSD-src-349e291a0a5aabbf5f59713cb6ee333032132650.tar.gz | |
Correctly link bsdcpio and bsdtar against libmd and libcrpyto
by applying the change from r221472 (libarchive).
Reviewed by: kientzle
Approved by: re (kib)
MFC after: 3 days
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/cpio/Makefile | 7 | ||||
| -rw-r--r-- | usr.bin/tar/Makefile | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index 5868e52..4c2bddb 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -19,11 +19,14 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive/libarchive_fe # statically linked, cannot use -lcrypto, and are size sensitive. CFLAGS+= -DSMALLER .endif -DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBMD} ${LIBLZMA} ${LIBBSDXML} -LDADD= -larchive -lz -lbz2 -lmd -llzma -lbsdxml +DPADD= ${LIBARCHIVE} ${LIBZ} ${LIBBZ2} ${LIBLZMA} ${LIBBSDXML} +LDADD= -larchive -lz -lbz2 -llzma -lbsdxml .if ${MK_OPENSSL} != "no" DPADD+= ${LIBCRYPTO} LDADD+= -lcrypto +.else +DPADD+= ${LIBMD} +LDADD+= -lmd .endif SYMLINKS=bsdcpio ${BINDIR}/cpio diff --git a/usr.bin/tar/Makefile b/usr.bin/tar/Makefile index ef21e44..3cd4ec3 100644 --- a/usr.bin/tar/Makefile +++ b/usr.bin/tar/Makefile @@ -18,12 +18,16 @@ SRCS+= err.c \ matching.c \ pathmatch.c -DPADD= ${LIBARCHIVE} ${LIBBZ2} ${LIBZ} ${LIBMD} ${LIBLZMA} ${LIBBSDXML} -LDADD= -larchive -lbz2 -lz -lmd -llzma -lbsdxml +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 + CFLAGS+= -DBSDTAR_VERSION_STRING=\"${BSDTAR_VERSION_STRING}\" CFLAGS+= -DPLATFORM_CONFIG_H=\"config_freebsd.h\" CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../../lib/libarchive |
