Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/libevent the rest of the build glue.
details: https://anonhg.NetBSD.org/src/rev/877f560bb06c
branches: trunk
changeset: 786017:877f560bb06c
user: christos <christos%NetBSD.org@localhost>
date: Thu Apr 11 16:59:16 2013 +0000
description:
the rest of the build glue.
diffstat:
external/bsd/libevent/Makefile | 4 +-
external/bsd/libevent/Makefile.inc | 11 +-
external/bsd/libevent/lib/Makefile | 104 +-----------------
external/bsd/libevent/lib/Makefile.inc | 2 +
external/bsd/libevent/lib/libevent/Makefile | 31 +++++
external/bsd/libevent/lib/libevent_openssl/Makefile | 13 ++
external/bsd/libevent/lib/libevent_pthreads/Makefile | 12 ++
external/bsd/libevent/lib/shlib_version | 6 -
external/bsd/libevent/prepare-import.sh | 63 -----------
9 files changed, 76 insertions(+), 170 deletions(-)
diffs (296 lines):
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/Makefile
--- a/external/bsd/libevent/Makefile Thu Apr 11 16:56:41 2013 +0000
+++ b/external/bsd/libevent/Makefile Thu Apr 11 16:59:16 2013 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2009/11/02 10:03:56 plunky Exp $
+# $NetBSD: Makefile,v 1.2 2013/04/11 16:59:16 christos Exp $
-SUBDIR= include lib
+SUBDIR = include lib man
.include <bsd.subdir.mk>
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/Makefile.inc
--- a/external/bsd/libevent/Makefile.inc Thu Apr 11 16:56:41 2013 +0000
+++ b/external/bsd/libevent/Makefile.inc Thu Apr 11 16:59:16 2013 +0000
@@ -1,12 +1,17 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/11/02 10:03:56 plunky Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/04/11 16:59:16 christos Exp $
.include <bsd.own.mk>
LIBEVENT_DIR= ${NETBSDSRCDIR}/external/bsd/libevent
+LIBEVENT_DIST= ${LIBEVENT_DIR}/dist
CPPFLAGS+= -DHAVE_CONFIG_H
-CPPFLAGS+= -I${LIBEVENT_DIR}/dist -I${LIBEVENT_DIR}/include
+CPPFLAGS+= -I${LIBEVENT_DIST} -I${LIBEVENT_DIR}/include
+CPPFLAGS+= -I${LIBEVENT_DIST}/include
+
+SHLIB_MAJOR= 4
+SHLIB_MINOR= 0
WARNS?= 4
-.PATH: ${LIBEVENT_DIR}/dist
+.PATH: ${LIBEVENT_DIST} ${LIBEVENT_DIST}/include
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/lib/Makefile
--- a/external/bsd/libevent/lib/Makefile Thu Apr 11 16:56:41 2013 +0000
+++ b/external/bsd/libevent/lib/Makefile Thu Apr 11 16:59:16 2013 +0000
@@ -1,98 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/11/02 10:03:56 plunky Exp $
-
-.include <bsd.init.mk>
-
-LIB= event
-USE_SHLIBDIR= yes
-
-SRCS= buffer.c evbuffer.c evdns.c event.c event_tagging.c \
- evrpc.c evutil.c http.c kqueue.c log.c poll.c select.c \
- signal.c
-
-CPPFLAGS+= -fno-strict-aliasing
-
-CPPFLAGS.evdns.c+= -Wno-shadow -Wno-cast-qual
-CPPFLAGS.event_tagging.c+= -Wno-cast-qual
-CPPFLAGS.evrpc.c+= -Wno-cast-qual
-CPPFLAGS.http.c+= -Wno-cast-qual -Wno-sign-compare
-CPPFLAGS.kqueue.c+= -Wno-sign-compare
-CPPFLAGS.select.c+= -Wno-sign-compare
-
-LINTFLAGS+= -X 27 # http.c "redeclaration of %s"
-
-MAN= evdns.3 event.3
-
-MLINKS+= event.3 event_init.3
-MLINKS+= event.3 event_dispatch.3
-MLINKS+= event.3 event_loop.3
-MLINKS+= event.3 event_loopexit.3
-MLINKS+= event.3 event_loopbreak.3
-MLINKS+= event.3 event_base_dispatch.3
-MLINKS+= event.3 event_base_free.3
-MLINKS+= event.3 event_base_loop.3
-MLINKS+= event.3 event_base_loopexit.3
-MLINKS+= event.3 event_base_loopbreak.3
-MLINKS+= event.3 event_base_set.3
-MLINKS+= event.3 event_set.3
-MLINKS+= event.3 event_add.3
-MLINKS+= event.3 event_del.3
-MLINKS+= event.3 event_once.3
-MLINKS+= event.3 event_base_once.3
-MLINKS+= event.3 event_pending.3
-MLINKS+= event.3 event_initialized.3
-
-MLINKS+= event.3 evtimer_set.3
-MLINKS+= event.3 evtimer_add.3
-MLINKS+= event.3 evtimer_del.3
-MLINKS+= event.3 evtimer_pending.3
-MLINKS+= event.3 evtimer_initialized.3
+# $NetBSD: Makefile,v 1.2 2013/04/11 16:59:16 christos Exp $
+.include <bsd.own.mk>
-MLINKS+= event.3 signal_set.3
-MLINKS+= event.3 signal_add.3
-MLINKS+= event.3 signal_del.3
-MLINKS+= event.3 signal_pending.3
-MLINKS+= event.3 signal_initialized.3
-
-MLINKS+= event.3 bufferevent_new.3
-MLINKS+= event.3 bufferevent_free.3
-MLINKS+= event.3 bufferevent_write.3
-MLINKS+= event.3 bufferevent_write_buffer.3
-MLINKS+= event.3 bufferevent_read.3
-MLINKS+= event.3 bufferevent_enable.3
-MLINKS+= event.3 bufferevent_disable.3
-MLINKS+= event.3 bufferevent_settimeout.3
-MLINKS+= event.3 bufferevent_base_set.3
+SUBDIR= libevent
+.if ${MKCRYPTO} != "no"
+SUBDIR+= libevent_openssl
+.endif
+SUBDIR+= libevent_pthreads
-MLINKS+= event.3 evbuffer_new.3
-MLINKS+= event.3 evbuffer_free.3
-MLINKS+= event.3 evbuffer_add.3
-MLINKS+= event.3 evbuffer_add_buffer.3
-MLINKS+= event.3 evbuffer_add_printf.3
-MLINKS+= event.3 evbuffer_add_vprintf.3
-MLINKS+= event.3 evbuffer_drain.3
-MLINKS+= event.3 evbuffer_write.3
-MLINKS+= event.3 evbuffer_read.3
-MLINKS+= event.3 evbuffer_find.3
-MLINKS+= event.3 evbuffer_readline.3
-
-MLINKS+= event.3 evhttp_new.3
-MLINKS+= event.3 evhttp_bind_socket.3
-MLINKS+= event.3 evhttp_free.3
-
-MLINKS+= evdns.3 evdns_init.3
-MLINKS+= evdns.3 evdns_shutdown.3
-MLINKS+= evdns.3 evdns_err_to_string.3
-MLINKS+= evdns.3 evdns_nameserver_add.3
-MLINKS+= evdns.3 evdns_count_nameservers.3
-MLINKS+= evdns.3 evdns_clear_nameservers_and_suspend.3
-MLINKS+= evdns.3 evdns_resume.3
-MLINKS+= evdns.3 evdns_nameserver_ip_add.3
-MLINKS+= evdns.3 evdns_resolve_ipv4.3
-MLINKS+= evdns.3 evdns_resolve_reverse.3
-MLINKS+= evdns.3 evdns_resolv_conf_parse.3
-MLINKS+= evdns.3 evdns_search_clear.3
-MLINKS+= evdns.3 evdns_search_add.3
-MLINKS+= evdns.3 evdns_search_ndots_set.3
-MLINKS+= evdns.3 evdns_set_log_fn.3
-
-.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/lib/Makefile.inc
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libevent/lib/Makefile.inc Thu Apr 11 16:59:16 2013 +0000
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/04/11 16:59:16 christos Exp $
+.include "../Makefile.inc"
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/lib/libevent/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libevent/lib/libevent/Makefile Thu Apr 11 16:59:16 2013 +0000
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1 2013/04/11 16:59:16 christos Exp $
+
+USE_SHLIBDIR=yes
+.include <bsd.own.mk>
+
+LIB=event
+
+SRCS= \
+buffer.c \
+bufferevent.c \
+bufferevent_filter.c \
+bufferevent_pair.c \
+bufferevent_ratelim.c \
+bufferevent_sock.c \
+evdns.c \
+event.c \
+event_tagging.c \
+evmap.c \
+evrpc.c \
+evthread.c \
+evutil.c \
+evutil_rand.c \
+http.c \
+kqueue.c \
+listener.c \
+log.c \
+poll.c \
+select.c \
+signal.c
+
+.include <bsd.lib.mk>
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/lib/libevent_openssl/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libevent/lib/libevent_openssl/Makefile Thu Apr 11 16:59:16 2013 +0000
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2013/04/11 16:59:17 christos Exp $
+
+.include <bsd.own.mk>
+
+LIB=event_openssl
+
+SRCS= \
+bufferevent_openssl.c
+
+LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto \
+ crypt ${NETBSDSRCDIR}/lib/libcrypt
+
+.include <bsd.lib.mk>
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/lib/libevent_pthreads/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/libevent/lib/libevent_pthreads/Makefile Thu Apr 11 16:59:16 2013 +0000
@@ -0,0 +1,12 @@
+# $NetBSD: Makefile,v 1.1 2013/04/11 16:59:17 christos Exp $
+
+LIB=event_pthreads
+
+COPTS+=-pthread
+
+SRCS= \
+evthread_pthread.c
+
+LIBDPLIBS+= pthread ${NETBSDSRCDIR}/lib/libpthread
+
+.include <bsd.lib.mk>
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/lib/shlib_version
--- a/external/bsd/libevent/lib/shlib_version Thu Apr 11 16:56:41 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-# $NetBSD: shlib_version,v 1.1 2009/11/02 10:03:57 plunky Exp $
-# Remember to update distrib/sets/lists/base/shl.* when changing
-#
-
-major=3
-minor=2
diff -r 7a036ce580e8 -r 877f560bb06c external/bsd/libevent/prepare-import.sh
--- a/external/bsd/libevent/prepare-import.sh Thu Apr 11 16:56:41 2013 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.2 2010/12/03 21:38:49 plunky Exp $
-
-# Extract the new tarball and rename the libevent-X.Y.Z directory
-# to dist. Run this script and check for additional files and
-# directories to prune, only relevant content is included.
-#
-# lib/ is built as SUBDIR from lib/Makefile, and
-# the regression tests are used from tests/lib/libevent
-#
-# Use the following template to import
-# cvs import src/external/bsd/file/dist LIBEVENT libevent-X-Y-Z-stable
-#
-# don't forget to bump the lib/shlib_version and commit the include/ files
-#
-
-set -e
-
-if [ -f dist/configure ]; then
- mkdir -p tmp
- cd tmp
- ../dist/configure
- make event-config.h
- mv config.h ../include # not needed for 2.*
- mv event-config.h ../include
- cd ..
- rm -Rf tmp
-
- echo "Removing unwanted distfiles .."
- cd dist
- rm -Rf Doxyfile Makefile.am Makefile.in WIN32-Code WIN32-Prj \
- aclocal.m4 autogen.sh compat config.guess config.h.in config.sub \
- configure configure.in devpoll.c epoll.c epoll_sub.c event_rpcgen.py \
- evport.c install-sh ltmain.sh missing mkinstalldirs sample \
- strlcpy.c test/Makefile.am test/Makefile.in test/bench.c \
- test/regress.rpc test/test-eof.c test/test-init.c test/test-time.c \
- test/test-weof.c test/test.sh
- cd ..
-fi
-
-echo "Adding RCS tags .."
-for f in $(grep -RL '\$NetBSD.*\$' dist include | grep -v CVS); do
- case $f in
- *.[ch])
- cat - ${f} > ${f}_tmp <<- EOF
- /* \$NetBSD\$ */
- EOF
- mv ${f}_tmp ${f}
- ;;
- *.[0-9])
- cat - ${f} > ${f}_tmp <<- EOF
- .\" \$NetBSD\$
- .\"
- EOF
- mv ${f}_tmp ${f}
- ;;
- *)
- echo "No RCS tag added to ${f}"
- ;;
- esac
-done
-
-echo "prepare-import done"
Home |
Main Index |
Thread Index |
Old Index