pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/libevent recognize builtin libevent-1.4 so that ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6a0e9ef3fa81
branches: trunk
changeset: 563617:6a0e9ef3fa81
user: drochner <drochner%pkgsrc.org@localhost>
date: Tue Aug 18 17:14:55 2009 +0000
description:
recognize builtin libevent-1.4 so that apps can build against it
This way we sidestep the mess introduced by conflicting libev/libevent,
at least on NetBSD>=5.
diffstat:
devel/libevent/builtin.mk | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diffs (34 lines):
diff -r f99b7683407d -r 6a0e9ef3fa81 devel/libevent/builtin.mk
--- a/devel/libevent/builtin.mk Tue Aug 18 17:11:31 2009 +0000
+++ b/devel/libevent/builtin.mk Tue Aug 18 17:14:55 2009 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: builtin.mk,v 1.7 2008/04/22 17:16:54 tnn Exp $
+# $NetBSD: builtin.mk,v 1.8 2009/08/18 17:14:55 drochner Exp $
BUILTIN_PKG:= libevent
-BUILTIN_FIND_FILES_VAR:= H_LIBEVENT
+BUILTIN_FIND_FILES_VAR:= H_LIBEVENT H_LIBEVENTCONFIG
BUILTIN_FIND_FILES.H_LIBEVENT= /usr/include/event.h
+BUILTIN_FIND_FILES.H_LIBEVENTCONFIG= /usr/include/event-config.h
.include "../../mk/buildlink3/bsd.builtin.mk"
@@ -26,6 +27,9 @@
.if !defined(BUILTIN_PKG.libevent) && \
!empty(IS_BUILTIN.libevent:M[yY][eE][sS]) && \
empty(H_LIBEVENT:M__nonexistent__)
+.if empty(H_LIBEVENTCONFIG:M__nonexistent__)
+BUILTIN_VERSION.libevent= 1.4.4
+.else
# libevent>=1.3: bufferevent_base_set added
_BLTN_EVENT_13!= \
${GREP} -c bufferevent_base_set ${H_LIBEVENT} || ${TRUE}
@@ -81,6 +85,7 @@
. else
BUILTIN_VERSION.libevent= 0.5
. endif
+.endif
BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent}
.endif
MAKEVARS+= BUILTIN_PKG.libevent
Home |
Main Index |
Thread Index |
Old Index