Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't build with OpenSSL by default because we install in /lib and there 

is no libcrypto there.
This commit is contained in:
christos 2023-08-17 15:30:35 +00:00
parent d10965f66c
commit e8748b797a
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
external/bsd/libpcap/Makefile.inc vendored
View File

@ -1,6 +1,7 @@
# $NetBSD: Makefile.inc,v 1.3 2023/08/17 15:18:12 christos Exp $ # $NetBSD: Makefile.inc,v 1.4 2023/08/17 15:30:35 christos Exp $
SRCDIR := ${.PARSEDIR}/dist SRCDIR := ${.PARSEDIR}/dist
USE_OPENSSL ?= no
CPPFLAGS+=-DLBL_ALIGN CPPFLAGS+=-DLBL_ALIGN
OPENSSLDIR= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR} OPENSSLDIR= ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}

4
external/bsd/libpcap/include/config.h vendored
View File

@ -136,8 +136,8 @@
/* Define to 1 if you have the <net/raw.h> header file. */ /* Define to 1 if you have the <net/raw.h> header file. */
/* #undef HAVE_NET_RAW_H */ /* #undef HAVE_NET_RAW_H */
/* Use OpenSSL */ /* Use OpenSSL from the Makefile */
#define HAVE_OPENSSL 1 /* #define HAVE_OPENSSL 1 */
/* if there's an os_proto.h for this platform, to use additional prototypes */ /* if there's an os_proto.h for this platform, to use additional prototypes */
/* #undef HAVE_OS_PROTO_H */ /* #undef HAVE_OS_PROTO_H */

9
external/bsd/libpcap/lib/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.32 2023/08/17 15:18:13 christos Exp $ # $NetBSD: Makefile,v 1.33 2023/08/17 15:30:36 christos Exp $
USE_SHLIBDIR=yes USE_SHLIBDIR=yes
.include <bsd.init.mk> .include <bsd.init.mk>
@ -148,8 +148,7 @@ savefile.c \
scanner.l \ scanner.l \
sf-pcap.c \ sf-pcap.c \
sf-pcapng.c \ sf-pcapng.c \
sockutils.c \ sockutils.c
sslutils.c
INCS= pcap/pcap.h pcap/namedb.h pcap/funcattrs.h \ INCS= pcap/pcap.h pcap/namedb.h pcap/funcattrs.h \
@ -181,7 +180,11 @@ grammar.y: grammar.y.in
${_MKTARGET_CREATE} ${_MKTARGET_CREATE}
${TOOL_SED} -e 's/@REENTRANT_PARSER@/%pure-parser/g' < ${.ALLSRC} > ${.TARGET} ${TOOL_SED} -e 's/@REENTRANT_PARSER@/%pure-parser/g' < ${.ALLSRC} > ${.TARGET}
.if ${USE_OPENSSL:Uno} == "yes"
CPPFLAGS += -DHAVE_OPENSSL
SRCS += sslutils.c
LIBDPLIBS += ssl ${OPENSSLDIR}/lib/libssl \ LIBDPLIBS += ssl ${OPENSSLDIR}/lib/libssl \
crypto ${OPENSSLDIR}/lib/libcrypto crypto ${OPENSSLDIR}/lib/libcrypto
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

10
external/bsd/libpcap/sbin/rpcapd/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.3 2023/08/17 15:18:13 christos Exp $ # $NetBSD: Makefile,v 1.4 2023/08/17 15:30:36 christos Exp $
USE_FORT?= yes # network server USE_FORT?= yes # network server
@ -34,8 +34,12 @@ CPPFLAGS+= -DHAVE_CONFIG_H
CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H CPPFLAGS+= -DPCAP_DONT_INCLUDE_PCAP_BPF_H
PROGDPLIBS+= pcap ${.CURDIR}/../../lib \ PROGDPLIBS+= pcap ${.CURDIR}/../../lib \
ssl ${OPENSSLDIR}/lib/libssl \
crypto ${OPENSSLDIR}/lib/libcrypto \
crypt ${NETBSDSRCDIR}/lib/libcrypt crypt ${NETBSDSRCDIR}/lib/libcrypt
.if ${USE_OPENSSL:Uno} == "yes"
CPPFLAGS+= -DHAVE_OPENSSL
PROGDPLIBS+= ssl ${OPENSSLDIR}/lib/libssl \
crypto ${OPENSSLDIR}/lib/libcrypto
.endif
.include <bsd.prog.mk> .include <bsd.prog.mk>