Module Name: src
Committed By: christos
Date: Sat Apr 22 15:12:59 UTC 2017
Modified Files:
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile
Log Message:
Obey MKCRYPTO.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/libarchive/lib/libarchive/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libarchive/include/config_netbsd.h
diff -u src/external/bsd/libarchive/include/config_netbsd.h:1.7 src/external/bsd/libarchive/include/config_netbsd.h:1.8
--- src/external/bsd/libarchive/include/config_netbsd.h:1.7 Thu Apr 20 09:11:04 2017
+++ src/external/bsd/libarchive/include/config_netbsd.h Sat Apr 22 11:12:59 2017
@@ -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 */
Index: src/external/bsd/libarchive/lib/libarchive/Makefile
diff -u src/external/bsd/libarchive/lib/libarchive/Makefile:1.4 src/external/bsd/libarchive/lib/libarchive/Makefile:1.5
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.4 Thu Apr 20 09:11:04 2017
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Sat Apr 22 11:12:59 2017
@@ -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
