Module Name: src
Committed By: kamil
Date: Sun May 21 22:32:56 UTC 2017
Modified Files:
src/external/bsd/libarchive/include: config_netbsd.h
src/external/bsd/libarchive/lib/libarchive: Makefile
Log Message:
Simplify linking libarchive with libcrypto
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/libarchive/include/config_netbsd.h
cvs rdiff -u -r1.6 -r1.7 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.8 src/external/bsd/libarchive/include/config_netbsd.h:1.9
--- src/external/bsd/libarchive/include/config_netbsd.h:1.8 Sat Apr 22 15:12:59 2017
+++ src/external/bsd/libarchive/include/config_netbsd.h Sun May 21 22:32:55 2017
@@ -606,7 +606,7 @@
/* #undef HAVE_LIBCHARSET */
/* Define to 1 if you have the `crypto' library (-lcrypto). */
-/* #undef1 HAVE_LIBCRYPTO */
+#define HAVE_LIBCRYPTO 1
/* 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.6 src/external/bsd/libarchive/lib/libarchive/Makefile:1.7
--- src/external/bsd/libarchive/lib/libarchive/Makefile:1.6 Sun May 21 15:28:39 2017
+++ src/external/bsd/libarchive/lib/libarchive/Makefile Sun May 21 22:32:56 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/05/21 15:28:39 riastradh Exp $
+# $NetBSD: Makefile,v 1.7 2017/05/21 22:32:56 kamil Exp $
.include <bsd.init.mk>
@@ -6,10 +6,9 @@
LIB= archive
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-CPPFLAGS+= -DHAVE_LIBCRYPTO
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
