From ab95087a0e405d6107443ce168f27ef7e9b2770b Mon Sep 17 00:00:00 2001 From: Adrian Chadd Date: Fri, 24 Jan 2020 06:24:40 +0000 Subject: [PATCH] [ntp] Don't compile in the ssl routines into libevent if MK_OPENSSL is no Most of ntpd still handles MK_OPENSSL ok, but the libevent import brought in the SSL bufferevent routines without checking MK_OPENSSL. This doesn't completely fix WITHOUT_CRYPTO=YES building, but hey, it's one less broken thing. --- usr.sbin/ntp/libntpevent/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.sbin/ntp/libntpevent/Makefile b/usr.sbin/ntp/libntpevent/Makefile index 2f784be5e3dc..f6cc3be687f7 100644 --- a/usr.sbin/ntp/libntpevent/Makefile +++ b/usr.sbin/ntp/libntpevent/Makefile @@ -1,16 +1,22 @@ # $FreeBSD$ +.include + .PATH: ${SRCTOP}/contrib/libevent LIB= ntpevent INTERNALLIB= -SRCS= buffer.c bufferevent.c bufferevent_filter.c bufferevent_openssl.c \ +SRCS= buffer.c bufferevent.c bufferevent_filter.c \ bufferevent_pair.c epoll.c evdns.c event.c event_tagging.c \ evmap.c evport.c evrpc.c evthread.c evthread_pthread.c evutil.c \ evutil_rand.c evutil_time.c http.c kqueue.c listener.c log.c poll.c \ select.c signal.c strlcpy.c +.if ${MK_OPENSSL} != "no" +SRCS+= bufferevent_openssl.c +.endif + .if ${MACHINE_ARCH} == "i386" NTP_ATOMIC=x86_32 .elif ${MACHINE_ARCH} == "amd64"