diff options
| author | drochner <drochner@pkgsrc.org> | 2009-08-18 17:14:55 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2009-08-18 17:14:55 +0000 |
| commit | cd35a63d16d5820944309627a9f49e9fce986d04 (patch) | |
| tree | 1ac8ead50a574cbdf4733f2370d34c6199aec8c8 /devel/libevent | |
| parent | 55a3b2d67ca9762b92dcb048a86a639b7ec4103d (diff) | |
| download | pkgsrc-cd35a63d16d5820944309627a9f49e9fce986d04.tar.gz | |
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 (limited to 'devel/libevent')
| -rw-r--r-- | devel/libevent/builtin.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk index 1e0e1e66d88..517985fe061 100644 --- a/devel/libevent/builtin.mk +++ b/devel/libevent/builtin.mk @@ -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 @@ MAKEVARS+= IS_BUILTIN.libevent .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 @@ BUILTIN_VERSION.libevent= 0.6 . else BUILTIN_VERSION.libevent= 0.5 . endif +.endif BUILTIN_PKG.libevent= libevent-${BUILTIN_VERSION.libevent} .endif MAKEVARS+= BUILTIN_PKG.libevent |