pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat fix detection of poll() for Darwi...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4efd4fde4b4e
branches:  trunk
changeset: 482292:4efd4fde4b4e
user:      grant <grant%pkgsrc.org@localhost>
date:      Sun Oct 24 11:18:33 2004 +0000

description:
fix detection of poll() for Darwin 7.x which has a poll()
compatibility function, but none of the required headers.

fixes bootstrap on Darwin 7.5.0 with gcc and xlc.

diffstat:

 pkgtools/libnbcompat/Makefile           |  4 ++--
 pkgtools/libnbcompat/files/configure    |  4 +++-
 pkgtools/libnbcompat/files/configure.ac |  6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diffs (51 lines):

diff -r aca631303503 -r 4efd4fde4b4e pkgtools/libnbcompat/Makefile
--- a/pkgtools/libnbcompat/Makefile     Sun Oct 24 11:17:45 2004 +0000
+++ b/pkgtools/libnbcompat/Makefile     Sun Oct 24 11:18:33 2004 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.42 2004/09/23 15:57:40 reed Exp $
+# $NetBSD: Makefile,v 1.43 2004/10/24 11:18:33 grant Exp $
 #
 # NOTE: If you update this package, it is *mandatory* that you update
 #      pkgsrc/pkgtools/libnbcompat/files/README to reflect the actual
 #      list of tested and supported platforms.
 #
 
-DISTNAME=              libnbcompat-20040911
+DISTNAME=              libnbcompat-20041024
 CATEGORIES=            pkgtools
 MASTER_SITES=          # empty
 DISTFILES=             # empty
diff -r aca631303503 -r 4efd4fde4b4e pkgtools/libnbcompat/files/configure
--- a/pkgtools/libnbcompat/files/configure      Sun Oct 24 11:17:45 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure      Sun Oct 24 11:18:33 2004 +0000
@@ -9660,7 +9660,9 @@
 pkg_use_nbcompat_poll=yes
 if test $pkg_cv_have_poll_h = yes; then
        pkg_use_nbcompat_poll=no
-else
+fi
+
+if test $pkg_cv_have_poll_h = yes -o test $pkg_cv_have_sys_poll_h = yes; then
        echo "$as_me:$LINENO: checking for poll" >&5
 echo $ECHO_N "checking for poll... $ECHO_C" >&6
 if test "${ac_cv_func_poll+set}" = set; then
diff -r aca631303503 -r 4efd4fde4b4e pkgtools/libnbcompat/files/configure.ac
--- a/pkgtools/libnbcompat/files/configure.ac   Sun Oct 24 11:17:45 2004 +0000
+++ b/pkgtools/libnbcompat/files/configure.ac   Sun Oct 24 11:18:33 2004 +0000
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.50 2004/09/11 19:01:40 jlam Exp $
+dnl $NetBSD: configure.ac,v 1.51 2004/10/24 11:18:33 grant Exp $
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
@@ -259,7 +259,9 @@
 pkg_use_nbcompat_poll=yes
 if test $pkg_cv_have_poll_h = yes; then
        pkg_use_nbcompat_poll=no
-else
+fi
+
+if test $pkg_cv_have_poll_h = yes -o test $pkg_cv_have_sys_poll_h = yes; then
        AC_CHECK_FUNC(poll, [
                AC_MSG_TRY_COMPILE([if poll() is implemented natively],
                 pkg_cv_native_poll,



Home | Main Index | Thread Index | Old Index