Module Name: src
Committed By: christos
Date: Wed Jun 29 19:45:14 UTC 2016
Modified Files:
src/external/bsd/tcpdump/bin: Makefile
src/external/bsd/tcpdump/include: config.h
Log Message:
Fix MKCRYPTO=no build
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/tcpdump/include/config.h
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/tcpdump/bin/Makefile
diff -u src/external/bsd/tcpdump/bin/Makefile:1.13 src/external/bsd/tcpdump/bin/Makefile:1.14
--- src/external/bsd/tcpdump/bin/Makefile:1.13 Tue Mar 31 17:59:35 2015
+++ src/external/bsd/tcpdump/bin/Makefile Wed Jun 29 15:45:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2015/03/31 21:59:35 christos Exp $
+# $NetBSD: Makefile,v 1.14 2016/06/29 19:45:14 christos Exp $
WARNS?= 1 # XXX: need to cleanup later
@@ -183,7 +183,7 @@ CPPFLAGS+=-DINET6=1 -DHAVE_RES_USE_INET6
.endif
.if (${MKCRYPTO} != "no")
-CPPFLAGS+=-DHAVE_LIBCRYPTO=1
+CPPFLAGS+=-DHAVE_LIBCRYPTO=1 -DHAVE_OPENSSL_EVP_H
LDADD+= -lcrypto -lcrypt
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
.endif
Index: src/external/bsd/tcpdump/include/config.h
diff -u src/external/bsd/tcpdump/include/config.h:1.7 src/external/bsd/tcpdump/include/config.h:1.8
--- src/external/bsd/tcpdump/include/config.h:1.7 Tue Mar 31 17:59:35 2015
+++ src/external/bsd/tcpdump/include/config.h Wed Jun 29 15:45:14 2016
@@ -60,7 +60,8 @@
/* #undef HAVE_LIBCAP_NG */
/* Define to 1 if you have the `crypto' library (-lcrypto). */
-#define HAVE_LIBCRYPTO 1
+/* in the Makefile */
+/* #undef HAVE_LIBCRYPTO */
/* Define to 1 if you have the `rpc' library (-lrpc). */
/* #undef HAVE_LIBRPC */
@@ -87,7 +88,8 @@
#define HAVE_OPENAT 1
/* Define to 1 if you have the <openssl/evp.h> header file. */
-#define HAVE_OPENSSL_EVP_H 1
+/* in the Makefile */
+/* #undef HAVE_OPENSSL_EVP_H */
/* if there's an os_proto.h for this platform, to use additional prototypes */
/* #undef HAVE_OS_PROTO_H */
