aboutsummaryrefslogtreecommitdiffstats
path: root/usr.bin/cpio/Makefile
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2011-08-01 08:22:40 +0000
committerMartin Matuska <mm@FreeBSD.org>2011-08-01 08:22:40 +0000
commit83c03ed27d83258cebf3fa276580a105a7c457f9 (patch)
treea31cd59b8392d9ed6c52d9604f5f561d9ecd34d8 /usr.bin/cpio/Makefile
parentfa53ff8858a99d1e54472bd9a7ba38815b2a1e5f (diff)
downloadsrc-83c03ed27d83258cebf3fa276580a105a7c457f9.tar.gz
src-83c03ed27d83258cebf3fa276580a105a7c457f9.zip
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
Notes
Notes: svn path=/head/; revision=224566
Diffstat (limited to 'usr.bin/cpio/Makefile')
-rw-r--r--usr.bin/cpio/Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile
index 5868e5236cbe..4c2bddb15648 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