diff options
| author | taca <taca@pkgsrc.org> | 2012-04-06 10:40:36 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2012-04-06 10:40:36 +0000 |
| commit | b1d216aa7896d49cd71ffd4b334dbebdb6acf968 (patch) | |
| tree | 4def5a7c50f7a2a00f55f4c60c56e3766bc3e1e0 /devel/glib2/patches | |
| parent | 242202bc24740555b81bcc31f0782b3cc8f3bf34 (diff) | |
| download | pkgsrc-b1d216aa7896d49cd71ffd4b334dbebdb6acf968.tar.gz | |
Make sure to initialize mutex before use it. Should be fix PR pkg/46266
by me.
Bump PKGREVISION but no need to recursive bump since it simply fixes
internal problem of glib2 and no external interface at all.
Diffstat (limited to 'devel/glib2/patches')
| -rw-r--r-- | devel/glib2/patches/patch-ce | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/devel/glib2/patches/patch-ce b/devel/glib2/patches/patch-ce index 95e811ebc2a..4d375860ab4 100644 --- a/devel/glib2/patches/patch-ce +++ b/devel/glib2/patches/patch-ce @@ -1,6 +1,12 @@ -$NetBSD: patch-ce,v 1.3 2012/01/29 10:46:54 drochner Exp $ +$NetBSD: patch-ce,v 1.4 2012/04/06 10:40:37 taca Exp $ ---- glib/gatomic.c.orig 2011-10-14 03:47:57.000000000 +0000 +* Fix inconsistency of .hidden attributes, leading to link error on amd64, + reported by Tobias Nygren. +* Make sure to initialize mutex before use it since it is problem on platforms + without support of GCC bultin atomic operations, such as NetBSD 4. + It looks like this problem dosen't exist on glib 2.31.0 and later. + +--- glib/gatomic.c.orig 2012-03-11 21:43:28.000000000 +0000 +++ glib/gatomic.c @@ -22,6 +22,7 @@ #include "config.h" @@ -10,3 +16,12 @@ $NetBSD: patch-ce,v 1.3 2012/01/29 10:46:54 drochner Exp $ /** * SECTION:atomic_operations +@@ -606,7 +606,7 @@ gsize + + #include "gthread.h" + +-static GStaticMutex g_atomic_lock; ++static GStaticMutex g_atomic_lock = G_STATIC_MUTEX_INIT; + + gint + (g_atomic_int_get) (volatile gint *atomic) |