diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-26 05:01:27 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-11-26 05:01:27 +0800 |
| commit | 94e60734f5a7d66925c536e374d202c128fc0d1b (patch) | |
| tree | 6790173c153d27161fca601bb3bc992217e88d08 /devel | |
| parent | 4f0bdc942f7ec965515d6ce4a047f15f6d9e06e8 (diff) | |
| download | marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.tar marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.tar.gz marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.tar.bz2 marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.tar.lz marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.tar.xz marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.tar.zst marcuscom-ports-94e60734f5a7d66925c536e374d202c128fc0d1b.zip | |
Import a fix from the FreeBSD ports tree that supports pthread_mutex_trylock()
returning EDEADLK.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3143 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/glib20/Makefile | 1 | ||||
| -rw-r--r-- | devel/glib20/files/patch-gthread_gthread-posix.c | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 25b15f99d..594446ea4 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -7,6 +7,7 @@ PORTNAME= glib PORTVERSION= 2.5.6 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/${PORTNAME}/2.5,} \ ftp://ftp.gtk.org/pub/gtk/v2.5/ \ diff --git a/devel/glib20/files/patch-gthread_gthread-posix.c b/devel/glib20/files/patch-gthread_gthread-posix.c index e240b9772..bdf24590d 100644 --- a/devel/glib20/files/patch-gthread_gthread-posix.c +++ b/devel/glib20/files/patch-gthread_gthread-posix.c @@ -1,5 +1,5 @@ ---- gthread/gthread-posix.c.orig Mon Nov 4 15:09:47 2002 -+++ gthread/gthread-posix.c Tue Jul 27 09:44:54 2004 +--- gthread/gthread-posix.c.orig Tue Sep 7 17:57:53 2004 ++++ gthread/gthread-posix.c Tue Sep 7 17:58:30 2004 @@ -116,6 +116,7 @@ #endif /* POSIX_MIN_PRIORITY && POSIX_MAX_PRIORITY */ @@ -18,6 +18,15 @@ #endif /* _SC_THREAD_STACK_MIN */ #ifdef HAVE_PRIORITIES # ifdef G_THREADS_IMPL_POSIX +@@ -176,7 +178,7 @@ + result = pthread_mutex_trylock ((pthread_mutex_t *) mutex); + + #ifdef G_THREADS_IMPL_POSIX +- if (result == EBUSY) ++ if ((result == EBUSY) || (result == EDEADLK)) + return FALSE; + #else /* G_THREADS_IMPL_DCE */ + if (result == 0) @@ -307,8 +309,12 @@ if (stack_size) { |