diff options
author | Ed Maste <emaste@FreeBSD.org> | 2018-10-09 18:35:45 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2018-10-09 18:35:45 +0000 |
commit | 539a27e105f7f7c657dc0f8bb297b9b571102cfb (patch) | |
tree | 9f6ce12fd02130bbf411b69c3708a8de5293c76f /Makefile.inc1 | |
parent | 2154b5b2db7a86f94f280df727dc3c6b419bcba2 (diff) | |
download | src-test2-539a27e105f7f7c657dc0f8bb297b9b571102cfb.tar.gz src-test2-539a27e105f7f7c657dc0f8bb297b9b571102cfb.zip |
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
Notes
Notes:
svn path=/head/; revision=339261
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 7716bfd70669..9e5ac26ce5b8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -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 |