[src/trunk]: src/external/bsd/libarchive Simplify linking libarchive with lib...

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

details:   https://anonhg.NetBSD.org/src/rev/5a186e9f63dd
branches:  trunk
changeset: 353765:5a186e9f63dd
user:      kamil <kamil%NetBSD.org@localhost>
date:      Sun May 21 22:32:55 2017 +0000

description:
Simplify linking libarchive with libcrypto

diffstat:

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

diffs (33 lines):

diff -r a0f4c432a78a -r 5a186e9f63dd external/bsd/libarchive/include/config_netbsd.h
--- a/external/bsd/libarchive/include/config_netbsd.h   Sun May 21 19:07:29 2017 +0000
+++ b/external/bsd/libarchive/include/config_netbsd.h   Sun May 21 22:32:55 2017 +0000
@@ -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 */
diff -r a0f4c432a78a -r 5a186e9f63dd external/bsd/libarchive/lib/libarchive/Makefile
--- a/external/bsd/libarchive/lib/libarchive/Makefile   Sun May 21 19:07:29 2017 +0000
+++ b/external/bsd/libarchive/lib/libarchive/Makefile   Sun May 21 22:32:55 2017 +0000
@@ -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