diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-16 16:35:55 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2012-05-16 16:35:55 +0800 |
| commit | 4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e (patch) | |
| tree | 52afefa408925d82ddd9548c76ecb4ee2a5281f3 | |
| parent | 3111ad281c8f16f565a456443ff887f6ea719457 (diff) | |
| download | marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.tar marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.tar.gz marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.tar.bz2 marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.tar.lz marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.tar.xz marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.tar.zst marcuscom-ports-4c64e1e0dc7c244414fee7b7a3dd4ab96dcbb82e.zip | |
Actualy add the threading patch. Doh!
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16750 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | devel/glib20/Makefile | 4 | ||||
| -rw-r--r-- | devel/glib20/files/patch-glib_gthread-posix.c | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 30cb5db7c..9f185b7e1 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -3,13 +3,13 @@ # Whom: Vanilla I. Shu <vanilla@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/devel/glib20/Makefile,v 1.220 2012/05/02 06:59:53 kwm Exp $ +# $MCom: ports/devel/glib20/Makefile,v 1.221 2012/05/15 15:16:56 kwm Exp $ # # !! DON'T FORGET ABOUT devel/gio-fam-backend !! PORTNAME= glib PORTVERSION= 2.32.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 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 000000000..0b3505616 --- /dev/null +++ b/devel/glib20/files/patch-glib_gthread-posix.c @@ -0,0 +1,20 @@ +--- glib/gthread-posix.c.orig 2012-05-13 18:23:49.000000000 -0400 ++++ glib/gthread-posix.c 2012-05-13 18:30:37.000000000 -0400 +@@ -89,7 +89,7 @@ g_mutex_impl_new (void) + if G_UNLIKELY (mutex == NULL) + g_thread_abort (errno, "malloc"); + +-#ifdef PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP ++#if defined(PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP) && !defined(__FreeBSD__) + pthread_mutexattr_t attr; + pthread_mutexattr_init (&attr); + pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_ADAPTIVE_NP); +@@ -99,7 +99,7 @@ g_mutex_impl_new (void) + if G_UNLIKELY ((status = pthread_mutex_init (mutex, pattr)) != 0) + g_thread_abort (status, "pthread_mutex_init"); + +-#ifdef PTHREAD_ADAPTIVE_MUTEX_NP ++#if defined(PTHREAD_ADAPTIVE_MUTEX_NP) && !defined(__FreeBSD__) + pthread_mutexattr_destroy (&attr); + #endif + |