Module Name: src
Committed By: christos
Date: Thu Apr 11 16:59:17 UTC 2013
Modified Files:
src/external/bsd/libevent: Makefile Makefile.inc
src/external/bsd/libevent/lib: Makefile
Added Files:
src/external/bsd/libevent/lib: Makefile.inc
src/external/bsd/libevent/lib/libevent: Makefile
src/external/bsd/libevent/lib/libevent_openssl: Makefile
src/external/bsd/libevent/lib/libevent_pthreads: Makefile
Removed Files:
src/external/bsd/libevent: prepare-import.sh
src/external/bsd/libevent/lib: shlib_version
Log Message:
the rest of the build glue.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libevent/Makefile \
src/external/bsd/libevent/Makefile.inc
cvs rdiff -u -r1.2 -r0 src/external/bsd/libevent/prepare-import.sh
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libevent/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/libevent/lib/Makefile.inc
cvs rdiff -u -r1.1 -r0 src/external/bsd/libevent/lib/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/bsd/libevent/lib/libevent/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/libevent/lib/libevent_openssl/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/libevent/lib/libevent_pthreads/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/libevent/Makefile
diff -u src/external/bsd/libevent/Makefile:1.1 src/external/bsd/libevent/Makefile:1.2
--- src/external/bsd/libevent/Makefile:1.1 Mon Nov 2 05:03:56 2009
+++ src/external/bsd/libevent/Makefile Thu Apr 11 12:59:16 2013
@@ -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>
Index: src/external/bsd/libevent/Makefile.inc
diff -u src/external/bsd/libevent/Makefile.inc:1.1 src/external/bsd/libevent/Makefile.inc:1.2
--- src/external/bsd/libevent/Makefile.inc:1.1 Mon Nov 2 05:03:56 2009
+++ src/external/bsd/libevent/Makefile.inc Thu Apr 11 12:59:16 2013
@@ -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
Index: src/external/bsd/libevent/lib/Makefile
diff -u src/external/bsd/libevent/lib/Makefile:1.1 src/external/bsd/libevent/lib/Makefile:1.2
--- src/external/bsd/libevent/lib/Makefile:1.1 Mon Nov 2 05:03:56 2009
+++ src/external/bsd/libevent/lib/Makefile Thu Apr 11 12:59:16 2013
@@ -1,98 +1,10 @@
-# $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 $
+.include <bsd.own.mk>
-.include <bsd.init.mk>
+SUBDIR= libevent
+.if ${MKCRYPTO} != "no"
+SUBDIR+= libevent_openssl
+.endif
+SUBDIR+= libevent_pthreads
-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
-
-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
-
-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>
Added files:
Index: src/external/bsd/libevent/lib/Makefile.inc
diff -u /dev/null src/external/bsd/libevent/lib/Makefile.inc:1.1
--- /dev/null Thu Apr 11 12:59:17 2013
+++ src/external/bsd/libevent/lib/Makefile.inc Thu Apr 11 12:59:16 2013
@@ -0,0 +1,2 @@
+# $NetBSD: Makefile.inc,v 1.1 2013/04/11 16:59:16 christos Exp $
+.include "../Makefile.inc"
Index: src/external/bsd/libevent/lib/libevent/Makefile
diff -u /dev/null src/external/bsd/libevent/lib/libevent/Makefile:1.1
--- /dev/null Thu Apr 11 12:59:17 2013
+++ src/external/bsd/libevent/lib/libevent/Makefile Thu Apr 11 12:59:16 2013
@@ -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>
Index: src/external/bsd/libevent/lib/libevent_openssl/Makefile
diff -u /dev/null src/external/bsd/libevent/lib/libevent_openssl/Makefile:1.1
--- /dev/null Thu Apr 11 12:59:17 2013
+++ src/external/bsd/libevent/lib/libevent_openssl/Makefile Thu Apr 11 12:59:17 2013
@@ -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>
Index: src/external/bsd/libevent/lib/libevent_pthreads/Makefile
diff -u /dev/null src/external/bsd/libevent/lib/libevent_pthreads/Makefile:1.1
--- /dev/null Thu Apr 11 12:59:17 2013
+++ src/external/bsd/libevent/lib/libevent_pthreads/Makefile Thu Apr 11 12:59:17 2013
@@ -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>
