rename in-tree libevent v1 to libevent1

r316063 installed pf's embedded libevent as a private lib, with headers
in /usr/include/private/event.  Unfortunately we also have a copy of
libevent v2 included in ntp, which needed to be updated for compatibility
with OpenSSL 1.1.

As unadorned 'libevent' generally refers to libevent v2, be explicit that
this one is libevent v1.

Reviewed by:	vangyzen (earlier)
Differential Revision:	https://reviews.freebsd.org/D17275
This commit is contained in:
Ed Maste 2020-05-28 22:05:50 +00:00
parent 0d0f3cdf58
commit c5ea81f7a6
8 changed files with 10 additions and 6 deletions

View File

@ -36,6 +36,10 @@
# xargs -n1 | sort | uniq -d;
# done
# 20200528: libevent renamed libevent1
OLD_FILES+=usr/include/private/event/event.h
OLD_DIRS+=usr/include/private/event
# 20200523: new clang import which bumps version from 10.0.0 to 10.0.1.s
OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/algorithm
OLD_FILES+=usr/lib/clang/10.0.0/include/cuda_wrappers/complex

View File

@ -11,7 +11,7 @@
private
bsdstat
..
event
event1
..
gmock
internal

View File

@ -48,7 +48,7 @@ SUBDIR= ${SUBDIR_BOOTSTRAP} \
libdwarf \
libedit \
libelftc \
libevent \
libevent1 \
libexecinfo \
libexpat \
libfetch \

View File

@ -5,7 +5,7 @@ PACKAGE=lib${LIB}
.include <src.opts.mk>
LIB= event
LIB= event1
SHLIB_MAJOR= 1
PRIVATELIB=

View File

@ -18,7 +18,7 @@ _PRIVATELIBS= \
auditd \
bsdstat \
devdctl \
event \
event1 \
gmock \
gtest \
gmock_main \

View File

@ -9,7 +9,7 @@ SRCS= ftp-proxy.c filter.c
CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
LIBADD= event
LIBADD= event1
WARNS?= 3

View File

@ -9,7 +9,7 @@ SRCS= parse.y ypldap.c log.c \
MAN= ypldap.8 ypldap.conf.5
LIBADD= openbsd event util rpcsvc
LIBADD= openbsd event1 util rpcsvc
CFLAGS+=-I${.CURDIR}
CFLAGS+=-I${SRCTOP}/contrib/pf/libevent