summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2010-12-29 10:10:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-06 10:06:28 +0000
commit656409795206a45284694b2c43d83c1cdccc0c8c (patch)
tree9a0492b03714957be6641251d89de070071cd2d7 /meta
parent40be3e1e9716a11ca1daffb67f6e5687e4242cd1 (diff)
downloadpoky-656409795206a45284694b2c43d83c1cdccc0c8c.tar.gz
glib-2.0: fix g_once_init_enter compile failure
Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded back in the 2.22 timeframe. It appears to still be present in 2.27. http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg00529.html Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch22
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb6
2 files changed, 26 insertions, 2 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch
new file mode 100644
index 0000000000..a2a506c2ad
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/g_once_init_enter.patch
@@ -0,0 +1,22 @@
1fix g_once_init_enter compile failure
2
3Kernelshark trips over a compile bug in glib-2.0 addressed by Open Embedded
4back in the 2.22 timeframe. It appears to still be present in 2.27.
5
6http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005
7
8Signed-off-by: Darren Hart <dvhart@linux.intel.com>
9
10Index: glib-2.27.5/glib/gthread.h
11===================================================================
12--- glib-2.27.5.orig/glib/gthread.h
13+++ glib-2.27.5/glib/gthread.h
14@@ -344,7 +344,7 @@ void g_once_init_leav
15 G_INLINE_FUNC gboolean
16 g_once_init_enter (volatile gsize *value_location)
17 {
18- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL)
19+ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL)
20 return FALSE;
21 else
22 return g_once_init_enter_impl (value_location);
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
index 442738aad3..171c8fe651 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb
@@ -1,10 +1,12 @@
1require glib.inc 1require glib.inc
2 2
3PR = "r0" 3PR = "r1"
4 4
5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \ 5SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.27/glib-${PV}.tar.bz2 \
6 file://configure-libtool.patch \ 6 file://configure-libtool.patch \
7 file://60_wait-longer-for-threads-to-die.patch" 7 file://60_wait-longer-for-threads-to-die.patch \
8 file://g_once_init_enter.patch \
9 "
8 10
9SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f" 11SRC_URI[md5sum] = "b7025b581bf78fcd656117bfc113f21f"
10SRC_URI[sha256sum] = "aad3038db865b762e01b1dc455ffd601b4083c069018d290e5fdfe1a61d328dc" 12SRC_URI[sha256sum] = "aad3038db865b762e01b1dc455ffd601b4083c069018d290e5fdfe1a61d328dc"