svn commit: r357068 - head/usr.sbin/ntp/libntpevent

Adrian Chadd adrian at FreeBSD.org
Fri Jan 24 06:24:41 UTC 2020


Author: adrian
Date: Fri Jan 24 06:24:40 2020
New Revision: 357068
URL: https://svnweb.freebsd.org/changeset/base/357068

Log:
  [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.

Modified:
  head/usr.sbin/ntp/libntpevent/Makefile

Modified: head/usr.sbin/ntp/libntpevent/Makefile
==============================================================================
--- head/usr.sbin/ntp/libntpevent/Makefile	Fri Jan 24 02:18:09 2020	(r357067)
+++ head/usr.sbin/ntp/libntpevent/Makefile	Fri Jan 24 06:24:40 2020	(r357068)
@@ -1,15 +1,21 @@
 # $FreeBSD$
 
+.include <src.opts.mk>
+
 .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


More information about the svn-src-head mailing list