From c22484279df745f37b3e80b125059d4167b01b7b Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 1 Feb 2011 13:07:27 -0800 Subject: glib-2.0: Add stable version 2.26.1 Signed-off-by: Saul Wold --- .../60_wait-longer-for-threads-to-die.patch | 31 +++++++++++++++++++ .../glib-2.0/glib-2.0/configure-libtool.patch | 36 ++++++++++++++++++++++ .../glib-2.0/glib-2.0/g_once_init_enter.patch | 22 +++++++++++++ .../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 22 +++++++++++++ 4 files changed, 111 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch create mode 100644 meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch (limited to 'meta/recipes-core/glib-2.0/glib-2.0') diff --git a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch new file mode 100644 index 0000000000..8195bd4922 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch @@ -0,0 +1,31 @@ +copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity. +Added to poky by Kevin Tian , 06/25/2010 +Rebased for glib-2.27.3 by Dongxiao Xu , 11/16/2010 + +diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c +--- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 ++++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 +@@ -5,8 +5,8 @@ + + #include + +-#define DEBUG_MSG(x) +-/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */ ++/* #define DEBUG_MSG(x) */ ++#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); + + #define WAIT 5 /* seconds */ + #define MAX_THREADS 10 +@@ -124,10 +124,10 @@ + DEBUG_MSG (("[unused] stopping unused threads")); + g_thread_pool_stop_unused_threads (); + +- DEBUG_MSG (("[unused] waiting ONE second for threads to die")); ++ DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); + + /* Some time for threads to die. */ +- g_usleep (G_USEC_PER_SEC); ++ g_usleep (5 * G_USEC_PER_SEC); + + DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", + g_thread_pool_get_num_unused_threads (), diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch new file mode 100644 index 0000000000..7c170be60f --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch @@ -0,0 +1,36 @@ +# Poky renames libtool to $host_alias-libtool. +# ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 +# so we can't call # it at this point. We can safely assume a version is available +# from PATH though +# Rebased to glib-2.27.3 by Dongxiao Xu + +diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac +--- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 ++++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 +@@ -1385,7 +1385,7 @@ + G_MODULE_LDFLAGS= + else + export SED +- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` + fi + dnl G_MODULE_IMPL= don't reset, so cmd-line can override + G_MODULE_NEED_USCORE=0 +@@ -1450,7 +1450,7 @@ + LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" + dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness + echo "void glib_plugin_test(void) { }" > plugin.c +- ${SHELL} ./libtool --mode=compile ${CC} -shared \ ++ ${SHELL} ./$host_alias-libtool --mode=compile ${CC} -shared \ + -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null + AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], + glib_cv_rtldglobal_broken,[ +@@ -1524,7 +1524,7 @@ + + AC_MSG_CHECKING(for the suffix of module shared libraries) + export SED +-shrext_cmds=`./libtool --config | grep '^shrext_cmds='` ++shrext_cmds=`./$host_alias-libtool --config | grep '^shrext_cmds='` + eval $shrext_cmds + module=yes eval std_shrext=$shrext_cmds + # chop the initial dot diff --git a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch new file mode 100644 index 0000000000..a2a506c2ad --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch @@ -0,0 +1,22 @@ +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/msg005 + +Signed-off-by: Darren Hart + +Index: glib-2.27.5/glib/gthread.h +=================================================================== +--- glib-2.27.5.orig/glib/gthread.h ++++ glib-2.27.5/glib/gthread.h +@@ -344,7 +344,7 @@ void g_once_init_leav + G_INLINE_FUNC gboolean + g_once_init_enter (volatile gsize *value_location) + { +- if G_LIKELY ((gpointer) g_atomic_pointer_get (value_location) != NULL) ++ if G_LIKELY ((gpointer) g_atomic_pointer_get ((volatile gpointer *)value_location) != NULL) + return FALSE; + else + return g_once_init_enter_impl (value_location); diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch new file mode 100644 index 0000000000..e54a8e5106 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch @@ -0,0 +1,22 @@ +# an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container +# for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d +# in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4. +# +# keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more +# portable here. mark for upstream +# +# by Kevin Tian , 06/25/2010 +# Rebased by Dongxiao Xu , 11/16/2010 + +diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in +--- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 ++++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 +@@ -52,7 +52,7 @@ + datadir=@datadir@ + datarootdir=@datarootdir@ + +-gettext_dir=$prefix/share/glib-2.0/gettext ++gettext_dir=@datadir@/glib-2.0/gettext + + while test $# -gt 0; do + case "$1" in -- cgit 1.2.3-korg