diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-08 09:40:02 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-08 09:40:02 +0800 |
| commit | 867e87b458914e9dc633b490780aefa538767979 (patch) | |
| tree | dd9f4adf92125dbfbc4c0729442b5dcf3d932273 | |
| parent | 294c5c4d70301e69d301ffd61590a622542b53e6 (diff) | |
| download | marcuscom-ports-experimental-867e87b458914e9dc633b490780aefa538767979.tar.gz marcuscom-ports-experimental-867e87b458914e9dc633b490780aefa538767979.tar.zst marcuscom-ports-experimental-867e87b458914e9dc633b490780aefa538767979.zip | |
Remove everything between the checks for PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP.
FreeBSD doesn't like it when one tries to lock adaptive mutexes. Bump the
PORTREVISION.
Submitted by: marcus
git-svn-id: svn://creme-brulee.marcuscom.com/ports-experimental/trunk@17439 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gthread-posix.c | 23 |
2 files changed, 25 insertions, 2 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index ba188d7..d0633ef 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,13 +3,13 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports-experimental/devel/glib20/Makefile,v 1.11 2012/05/03 03:57:38 mezz Exp $ +# $MCom: ports-experimental/devel/glib20/Makefile,v 1.12 2012/05/03 22:05:15 mezz Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib PORTVERSION= 2.32.2 -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \ diff --git a/devel/glib20/files/patch-glib_gthread-posix.c b/devel/glib20/files/patch-glib_gthread-posix.c new file mode 100644 index 0000000..34d479c --- /dev/null +++ b/devel/glib20/files/patch-glib_gthread-posix.c @@ -0,0 +1,23 @@ +--- glib/gthread-posix.c.orig 2012-05-07 20:32:49.000000000 -0500 ++++ glib/gthread-posix.c 2012-05-07 20:33:45.000000000 -0500 +@@ -89,20 +89,9 @@ + if G_UNLIKELY (mutex == NULL) + g_thread_abort (errno, "malloc"); + +-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP +- pthread_mutexattr_t attr; +- pthread_mutexattr_init (&attr); +- pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); +- pattr = &attr; +-#endif +- + if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0) + g_thread_abort (status, "pthread_mutex_init"); + +-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP +- pthread_mutexattr_destroy (&attr); +-#endif +- + return mutex; + } + |