glib 2.10: Init gatomic before gconvert, fixing crashes on ARM

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@505 311d38ba-8fff-0310-9ca6-ca027cbcb966

3 files changed, 21 insertions, 2 deletions

diff --git a/openembedded/packages/glib-2.0/files/atomic_fix.patch b/openembedded/packages/glib-2.0/files/atomic_fix.patch
new file mode 100644
index 0000000000..ddc7ada778
--- /dev/null
+++ b/openembedded/packages/glib-2.0/files/atomic_fix.patch
@@ -0,0 +1,16 @@
+Index: glib-2.10.3/glib/gthread.c
+===================================================================
+--- glib-2.10.3.orig/glib/gthread.c     2005-12-01 16:34:26.000000000 +0000
++++ glib-2.10.3/glib/gthread.c  2006-07-06 08:17:18.000000000 +0100
+@@ -164,10 +164,10 @@
+   _g_messages_thread_init_nomessage ();
+ 
+   /* we may run full-fledged initializers from here */
++  _g_atomic_thread_init ();
+   _g_convert_thread_init ();
+   _g_rand_thread_init ();
+   _g_main_thread_init ();
+-  _g_atomic_thread_init ();
+   _g_utils_thread_init ();
+ #ifdef G_OS_WIN32
+   _g_win32_thread_init ();
diff --git a/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb b/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb
index d0a442eeef..402ec2d390 100644
--- a/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb
+++ b/openembedded/packages/glib-2.0/glib-2.0-native_2.10.3.bb
@@ -7,11 +7,13 @@ LICENSE = "LGPL"
 SECTION = "libs"
 PRIORITY = "optional"
 DEPENDS += "gtk-doc-native"
+PR="r1"
 
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \
-           file://glib-gettextize-dir.patch;patch=1 \
+           file://glib-gettextize-dir.patch;patch=1 \
+           file://atomic_fix.patch;patch=1 \
            file://glibconfig-sysdefs.h"
 
 S = "${WORKDIR}/glib-${PV}"
diff --git a/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb b/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb
index 1c887e0206..df0f3bd82c 100644
--- a/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb
+++ b/openembedded/packages/glib-2.0/glib-2.0_2.10.3.bb
@@ -9,7 +9,7 @@ PRIORITY = "optional"
 DEPENDS += "glib-2.0-native gtk-doc"
 DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
-PR = "r1"
+PR = "r3"
 
 LEAD_SONAME = "libglib-2.0.*"
 FILES_glib-2.0-utils = "${bindir}/*"
@@ -17,6 +17,7 @@ FILES_glib-2.0-utils = "${bindir}/*"
 EXTRA_OECONF = "--disable-debug"
 
 SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \
+           file://atomic_fix.patch;patch=1 \
            file://glibconfig-sysdefs.h"
 
 S = "${WORKDIR}/glib-${PV}"