svn commit: r224646 - in stable/8/usr.bin: cpio tar

[Martin Matuska]

Author: mm
Date: Thu Aug  4 07:29:08 2011
New Revision: 224646
URL: http://svn.freebsd.org/changeset/base/224646

Log:
  MFC r224566:
  
  Correctly link bsdcpio and bsdtar against libmd and libcrpyto
  by applying the change from r221472 (libarchive).
  
  Reviewed by:	kientzle

Modified:
  stable/8/usr.bin/cpio/Makefile
  stable/8/usr.bin/tar/Makefile
Directory Properties:
  stable/8/usr.bin/cpio/   (props changed)
  stable/8/usr.bin/tar/   (props changed)

Modified: stable/8/usr.bin/cpio/Makefile
==============================================================================
--- stable/8/usr.bin/cpio/Makefile	Thu Aug  4 03:04:05 2011	(r224645)
+++ stable/8/usr.bin/cpio/Makefile	Thu Aug  4 07:29:08 2011	(r224646)
@@ -21,11 +21,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: stable/8/usr.bin/tar/Makefile
==============================================================================
--- stable/8/usr.bin/tar/Makefile	Thu Aug  4 03:04:05 2011	(r224645)
+++ stable/8/usr.bin/tar/Makefile	Thu Aug  4 07:29:08 2011	(r224646)
@@ -19,12 +19,16 @@ SRCS+=	err.c		\
 	pathmatch.c
 
 WARNS?=	6
-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