Date: Mon, 27 Feb 2012 13:00:18 GMT From: "Ildar Hizbulin" <hizel@vyborg.ru> To: gnome@FreeBSD.org Subject: Re: ports/165358: sysutils/policykit do not build while installed devel/libinotify Message-ID: <201202271300.q1RD0IRt099367@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/165358; it has been noted by GNATS. From: "Ildar Hizbulin" <hizel@vyborg.ru> To: bug-followup@freebsd.org Cc: Subject: Re: ports/165358: sysutils/policykit do not build while installed devel/libinotify Date: Mon, 27 Feb 2012 16:29:06 +0400 My best patch: disable INOTIFY if KQUEUE found diff -ruN policykit.orig/Makefile policykit/Makefile --- policykit.orig/Makefile 2011-11-09 19:25:44.000000000 +0400 +++ policykit/Makefile 2012-02-27 16:21:34.000000000 +0400 @@ -8,7 +8,7 @@ PORTNAME= policykit PORTVERSION= 0.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= sysutils gnome MASTER_SITES= http://hal.freedesktop.org/releases/ DISTNAME= PolicyKit-${PORTVERSION} @@ -22,6 +22,8 @@ USERS= polkit GROUPS= polkit +USE_AUTOTOOLS= aclocal autoheader automake autoconf libtool +ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal USE_GNOME= gnomehack glib20 intlhack USE_GMAKE= yes GNU_CONFIGURE= yes diff -ruN policykit.orig/files/patch-configure.in policykit/files/patch-configure.in --- policykit.orig/files/patch-configure.in 1970-01-01 03:00:00.000000000 +0300 +++ policykit/files/patch-configure.in 2012-02-27 16:21:34.000000000 +0400 @@ -0,0 +1,37 @@ +--- configure.in.orig 2008-06-30 23:40:59.000000000 +0400 ++++ configure.in 2012-02-27 16:15:17.000000000 +0400 +@@ -527,16 +527,6 @@ + ;; + esac + +-have_inotify=no +-AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes]) +-AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes]) +- +-AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes") +- +-if test "x$have_inotify" = "xyes" ; then +- AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage]) +-fi +- + have_kqueue=yes + AC_CHECK_FUNCS([kqueue],,have_kqueue=no) + +@@ -546,6 +536,17 @@ + AC_DEFINE([HAVE_KQUEUE], 1, [Enable BSD kqueue() usage]) + fi + ++have_inotify=no ++if test "x$have_kqueue" != "xyes" ; then ++ AC_CHECK_HEADERS([linux/inotify.h], [have_inotify=yes]) ++ AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes]) ++fi ++AM_CONDITIONAL(HAVE_INOTIFY, test "x$have_inotify" = "xyes") ++if test "x$have_inotify" = "xyes" ; then ++ AC_DEFINE([HAVE_INOTIFY], 1, [Enable Linux inotify() usage]) ++fi ++ ++ + # ******************** + # Internationalisation + # ******************** -- e-mail: hizel@vyborg.ru jid: hizel@vyborg.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201202271300.q1RD0IRt099367>