svn commit: r224566 - in head/usr.bin: cpio tar

[Martin Matuska]

Author: mm
Date: Mon Aug  1 08:22:40 2011
New Revision: 224566
URL: http://svn.freebsd.org/changeset/base/224566

Log:
  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

Modified:
  head/usr.bin/cpio/Makefile
  head/usr.bin/tar/Makefile

Modified: head/usr.bin/cpio/Makefile
==============================================================================
--- head/usr.bin/cpio/Makefile	Mon Aug  1 08:17:54 2011	(r224565)
+++ head/usr.bin/cpio/Makefile	Mon Aug  1 08:22:40 2011	(r224566)
@@ -19,11 +19,14 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../..
 # 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

Modified: head/usr.bin/tar/Makefile
==============================================================================
--- head/usr.bin/tar/Makefile	Mon Aug  1 08:17:54 2011	(r224565)
+++ head/usr.bin/tar/Makefile	Mon Aug  1 08:22:40 2011	(r224566)
@@ -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