summaryrefslogtreecommitdiff
path: root/devel/glib20
diff options
context:
space:
mode:
authorJeremy Lea <reg@FreeBSD.org>2000-02-12 18:59:51 +0000
committerJeremy Lea <reg@FreeBSD.org>2000-02-12 18:59:51 +0000
commitbe6e15d519036bc8399d9fce18a577f6d76b73b6 (patch)
tree21390d91385023178a876ff8d66fbd9a93260ed2 /devel/glib20
parentWoops, "timeval" -> "struct timeval" (diff)
Enable the use of poll() on -current.
Fix bad C++ define of NULL. Approved by: maintainer
Notes
Notes: svn path=/head/; revision=25697
Diffstat (limited to 'devel/glib20')
-rw-r--r--devel/glib20/files/patch-ae7
1 files changed, 5 insertions, 2 deletions
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index bb5061b59f99..49aa09418338 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -37,7 +37,7 @@
esac
LIBS_orig="$LIBS"
LDFLAGS_orig="$LDFLAGS"
-@@ -5057,11 +5063,14 @@
+@@ -5057,11 +5063,17 @@
G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
fi
;;
@@ -50,7 +50,10 @@
+ if test x"$G_THREAD_LIBS" = x"-lc_r"; then
+ G_THREAD_CFLAGS="-D_THREAD_SAFE"
+ G_THREAD_LIBS="-pthread"
-+ have_poll=no
++ case $host in
++ *-*-freebsd4*) ;;
++ default) have_poll=no ;;
++ esac
+ else
+ G_THREAD_CFLAGS="-D_THREAD_SAFE -DLINUXTHREADS"
+ fi