diff options
author | jmmv <jmmv@pkgsrc.org> | 2005-01-05 16:21:06 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2005-01-05 16:21:06 +0000 |
commit | 260fe2f2cbc9953e9cd56b085b0a29e5800d43be (patch) | |
tree | 62db45d412c0b9b1ee118ac2574908e483108696 /sysutils/fam/Makefile | |
parent | b3aaa4a382ab43e3f74cd9ae895b32cded3716e6 (diff) | |
download | pkgsrc-260fe2f2cbc9953e9cd56b085b0a29e5800d43be.tar.gz |
Fix some long-standing kqueue bugs that have been bothering me for a long
time. For example, simply running 'nautilus /' could lock up famd in pipewr
status. To fix:
- Make the struct devino's sorting function work properly; otherwise the
map behaves incorrectly.
- Handle kqueue errors if they are returned as an entry in the events table
(with flags containing EV_ERROR).
While here, add more debugging code that helped me catch this issue (some
extra messages and assertions).
Also reenable assertions (except on Darwin as, according to version 1.14 of
the Makefile, they cause problems).
Not bumping revision because kqueue support is still off by default.
Diffstat (limited to 'sysutils/fam/Makefile')
-rw-r--r-- | sysutils/fam/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile index e04366b0f18..fe4d8f57977 100644 --- a/sysutils/fam/Makefile +++ b/sysutils/fam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2004/12/28 02:47:50 reed Exp $ +# $NetBSD: Makefile,v 1.22 2005/01/05 16:21:06 jmmv Exp $ # DISTNAME= fam-2.7.0 @@ -21,7 +21,6 @@ USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LANGUAGES= c c++ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS} -DNDEBUG" EGDIR= ${PREFIX}/share/examples/fam CONF_FILES= ${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf @@ -39,7 +38,8 @@ PKG_SUPPORTED_OPTIONS= kqueue .include "../../mk/bsd.options.mk" -.if !empty(PKG_OPTIONS:Mkqueue) && ${OPSYS} == "NetBSD" +.if !empty(PKG_OPTIONS:Mkqueue) && \ + (${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD") CPPFLAGS+= -DHAVE_KQUEUE SUBST_CLASSES+= kqueue @@ -54,6 +54,7 @@ MESSAGE_SRC= ${.CURDIR}/MESSAGE ${.CURDIR}/MESSAGE.kqueue .include "../../mk/pthread.buildlink3.mk" .endif +CPPFLAGS.Darwin+= -DNDEBUG LDFLAGS.SunOS+= -lsocket -lnsl .if ${OPSYS} == "SunOS" |