[src/trunk]: src/external/bsd/libarchive Obey MKCRYPTO.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e82838e13be0
branches:  trunk
changeset: 823422:e82838e13be0
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Apr 22 15:12:59 2017 +0000

description:
Obey MKCRYPTO.

diffstat:

 external/bsd/libarchive/include/config_netbsd.h |  2 +-
 external/bsd/libarchive/lib/libarchive/Makefile |  8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r a2dc333fbe39 -r e82838e13be0 external/bsd/libarchive/include/config_netbsd.h
--- a/external/bsd/libarchive/include/config_netbsd.h   Sat Apr 22 15:07:49 2017 +0000
+++ b/external/bsd/libarchive/include/config_netbsd.h   Sat Apr 22 15:12:59 2017 +0000
@@ -606,7 +606,7 @@
 /* #undef HAVE_LIBCHARSET */
 
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
-#define HAVE_LIBCRYPTO 1
+/* #undef1 HAVE_LIBCRYPTO */
 
 /* Define to 1 if you have the `eay32' library (-leay32). */
 /* #undef HAVE_LIBEAY32 */
diff -r a2dc333fbe39 -r e82838e13be0 external/bsd/libarchive/lib/libarchive/Makefile
--- a/external/bsd/libarchive/lib/libarchive/Makefile   Sat Apr 22 15:07:49 2017 +0000
+++ b/external/bsd/libarchive/lib/libarchive/Makefile   Sat Apr 22 15:12:59 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2017/04/20 13:11:04 joerg Exp $
+#      $NetBSD: Makefile,v 1.5 2017/04/22 15:12:59 christos Exp $
 
 .include <bsd.init.mk>
 
@@ -6,8 +6,12 @@
 
 LIB=           archive
 
+.if ${MKCRYPTO:Uno} == "yes"
+LIBDPLIBS+=    crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+CPPFLAGS+=     -DHAVE_LIBCRYPTO
+.endif
+
 LIBDPLIBS+=    bz2     ${NETBSDSRCDIR}/lib/libbz2 \
-               crypto  ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
                expat   ${NETBSDSRCDIR}/external/mit/expat/lib/libexpat \
                lzma    ${NETBSDSRCDIR}/external/public-domain/xz/lib \
                z       ${NETBSDSRCDIR}/lib/libz