diff options
author | Kevin Tian <kevin.tian@intel.com> | 2010-06-25 15:07:01 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-02 15:32:28 -0700 |
commit | 31180a56d1b6981fa9d5588ad3538f34e339e0fe (patch) | |
tree | 2e4bb97f22d2d02357f316c8a628dea6af1059ff /meta/packages/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch | |
parent | 6b81c6dbb55d57a0f8d96ee5e3f5d1e6148850b1 (diff) | |
download | openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.gz openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.bz2 openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.xz openembedded-core-31180a56d1b6981fa9d5588ad3538f34e339e0fe.zip |
glib-2.0: upgrade to 2.24.1
(borrow from OE 2.24.0, with study about reason for detail changes)
[Patches-Poky]
KEEP _configure-libtool.patch_: fix cross-build env
REMOVE _glibconfig-sysdefs.h_: introduced in glib-1.2.10, which is actually
not valid today
KEEP _glib-gettexize-dir.patch_: another quite old patch added before 2.10.3
add history info, and mark for upstream
[Patches-OE]
NOTAKE _gio.patch_: a private extension for a window matching library (wncksync)
NOTAKE _gvavriant.patch_: in 2.24.1 now
NOTAKE _gasync.patch_: in 2.24.1 now
TAKE _60_wait-longer-for-threads-to-die.patch: said to fix anonying warning
TAKE _gatomic-proper-get-cast.patch_: fix error about type casting. Instead of
using OE's patch, I found a better one from latest repo
NOTAKE _g_once_init_enter.patch_: in OE since 2.22.1, not quite sure of its purpose,
also it's not in upstream yet
[Recipe]
- fix metadata
- keep glib-2.inc which is for python optimization
- remove PRIORITY since 'optional' is the default
- no need to specially install glibconfig.h in ad hoc path, which is only relied
by 'obexpush' which poky doesn't have and can be fixed in 'obexpush' itself as
what OE does
- no need to manually create glib2.0/glib, which is handled by current code
- remove 'acpaths' which only applies to versions before 2.12.4
- below lines are not taken from OE
* glib-mkenums tweaks, which exists in OE for a long time but never in poky.
since there's no way to find out original commit, keep poky's style instead.
* host libtool check. not sure about its purpose, and it's also in OE for quite
long time
Signed-off-by Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch')
-rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch b/meta/packages/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch new file mode 100644 index 000000000..1676b3e25 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.24.1/60_wait-longer-for-threads-to-die.patch @@ -0,0 +1,29 @@ +# copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity. +# +# by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 +--- glib/tests/threadpool-test.c.old 2008-02-12 06:11:21.000000000 +0100 ++++ glib/tests/threadpool-test.c 2008-02-12 06:11:52.000000000 +0100 +@@ -5,8 +5,8 @@ + + #include <glib.h> + +-#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 (), |