svn commit: r339261 - in head: . usr.sbin/ntp/libntpevent
Ed Maste
emaste at FreeBSD.org
Tue Oct 9 18:35:46 UTC 2018
Author: emaste
Date: Tue Oct 9 18:35:45 2018
New Revision: 339261
URL: https://svnweb.freebsd.org/changeset/base/339261
Log:
Switch ntp's embedded libevent to 2.1.18
For OpenSSL 1.1.1 compatibility.
In Makefile.inc1 add (to the existing similar cases) a hack to handle
dependencies across the migration.
Reviewed by: jhb
Approved by: re (gjb)
Sponsored by: The FreeBSD Foundation.
Differential Revision: https://reviews.freebsd.org/D17481
Modified:
head/Makefile.inc1
head/usr.sbin/ntp/libntpevent/Makefile
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Tue Oct 9 17:44:25 2018 (r339260)
+++ head/Makefile.inc1 Tue Oct 9 18:35:45 2018 (r339261)
@@ -939,6 +939,13 @@ _cleanobj_fast_depend_hack: .PHONY
${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/lib/libc/.depend.${f}.*}; \
fi
.endfor
+# 20181009 track migration from ntp's embedded libevent to updated one
+ @if [ -e "${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o" ] && \
+ egrep -q 'contrib/ntp/sntp/libevent/bufferevent_openssl.c' \
+ ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.bufferevent_openssl.o ; then \
+ echo "Removing stale libevent dependencies"; \
+ rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \
+ fi
_worldtmp: .PHONY
@echo
Modified: head/usr.sbin/ntp/libntpevent/Makefile
==============================================================================
--- head/usr.sbin/ntp/libntpevent/Makefile Tue Oct 9 17:44:25 2018 (r339260)
+++ head/usr.sbin/ntp/libntpevent/Makefile Tue Oct 9 18:35:45 2018 (r339261)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.PATH: ${SRCTOP}/contrib/ntp/sntp/libevent
+.PATH: ${SRCTOP}/contrib/libevent
LIB= ntpevent
INTERNALLIB=
@@ -26,7 +26,7 @@ NTP_ATOMIC=noatomic
.endif
CFLAGS+= -I${SRCTOP}/contrib/ntp/include \
- -I${SRCTOP}/contrib/ntp/sntp/libevent/include \
+ -I${SRCTOP}/contrib/libevent/include \
-I${.CURDIR}/
CFLAGS+= -DHAVE_BSD_NICE -DHAVE_STDINT_H
More information about the svn-src-all
mailing list