From 494afcb2fe79681b6cbca991a2aafe1801cba31a Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Tue, 16 Nov 2010 13:10:06 +0800 Subject: glib-2.0: Upgraded to version 2.27.3 Remove gatomic-proper-pointer-get-cast.patch since the logic is already in latest upstream. Rebase other patches to fit the latest code. [sgw@linux.intel.com: Fixed LIC_FILES_CHKSUM] Signed-off-by: Dongxiao Xu Signed-off-by: Saul Wold --- .../60_wait-longer-for-threads-to-die.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch (limited to 'meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch') diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/60_wait-longer-for-threads-to-die.patch new file mode 100644 index 000000000..8195bd492 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.3/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 (), -- cgit v1.2.3