diff options
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0-2.27.5')
3 files changed, 89 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/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-2.27.5/60_wait-longer-for-threads-to-die.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for sanity. | ||
2 | Added to poky by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 | ||
3 | Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | ||
4 | |||
5 | diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c | ||
6 | --- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 | ||
7 | +++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 | ||
8 | @@ -5,8 +5,8 @@ | ||
9 | |||
10 | #include <glib.h> | ||
11 | |||
12 | -#define DEBUG_MSG(x) | ||
13 | -/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */ | ||
14 | +/* #define DEBUG_MSG(x) */ | ||
15 | +#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); | ||
16 | |||
17 | #define WAIT 5 /* seconds */ | ||
18 | #define MAX_THREADS 10 | ||
19 | @@ -124,10 +124,10 @@ | ||
20 | DEBUG_MSG (("[unused] stopping unused threads")); | ||
21 | g_thread_pool_stop_unused_threads (); | ||
22 | |||
23 | - DEBUG_MSG (("[unused] waiting ONE second for threads to die")); | ||
24 | + DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); | ||
25 | |||
26 | /* Some time for threads to die. */ | ||
27 | - g_usleep (G_USEC_PER_SEC); | ||
28 | + g_usleep (5 * G_USEC_PER_SEC); | ||
29 | |||
30 | DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", | ||
31 | g_thread_pool_get_num_unused_threads (), | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch new file mode 100644 index 0000000000..a5dd4f249e --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/configure-libtool.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | # Poky renames libtool to $host_alias-libtool. | ||
2 | # ./$host_alias-libtool isn't created until after configure runs with libtool >= 2.2.2 | ||
3 | # so we can't call # it at this point. We can safely assume a version is available | ||
4 | # from PATH though | ||
5 | # Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> | ||
6 | |||
7 | diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac | ||
8 | --- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 | ||
9 | +++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 | ||
10 | @@ -1385,7 +1385,7 @@ | ||
11 | G_MODULE_LDFLAGS= | ||
12 | else | ||
13 | export SED | ||
14 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
15 | + G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
16 | fi | ||
17 | dnl G_MODULE_IMPL= don't reset, so cmd-line can override | ||
18 | G_MODULE_NEED_USCORE=0 | ||
19 | @@ -1450,7 +1450,7 @@ | ||
20 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" | ||
21 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness | ||
22 | echo "void glib_plugin_test(void) { }" > plugin.c | ||
23 | - ${SHELL} ./libtool --mode=compile ${CC} -shared \ | ||
24 | + ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ | ||
25 | -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null | ||
26 | AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], | ||
27 | glib_cv_rtldglobal_broken,[ | ||
28 | @@ -1524,7 +1524,7 @@ | ||
29 | |||
30 | AC_MSG_CHECKING(for the suffix of module shared libraries) | ||
31 | export SED | ||
32 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` | ||
33 | +shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` | ||
34 | eval $shrext_cmds | ||
35 | module=yes eval std_shrext=$shrext_cmds | ||
36 | # chop the initial dot | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch new file mode 100644 index 0000000000..e54a8e5106 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0-2.27.5/glib-gettextize-dir.patch | |||
@@ -0,0 +1,22 @@ | |||
1 | # an very old patch cherry-picked in every glib-2.0 patch directory. The earliest container | ||
2 | # for it is 2.6.5 in OE. The earliest commit for it is c8e5702127e507e82e6f68a4b8c546803accea9d | ||
3 | # in OE side which ports from previous bitkeeper SCM. In OE side it's only used til 2.12.4. | ||
4 | # | ||
5 | # keep it since it's always cleaner to not hardcode destination path. Use @datadir@ is more | ||
6 | # portable here. mark for upstream | ||
7 | # | ||
8 | # by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 | ||
9 | # Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | ||
10 | |||
11 | diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in | ||
12 | --- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 | ||
13 | +++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 | ||
14 | @@ -52,7 +52,7 @@ | ||
15 | datadir=@datadir@ | ||
16 | datarootdir=@datarootdir@ | ||
17 | |||
18 | -gettext_dir=$prefix/share/glib-2.0/gettext | ||
19 | +gettext_dir=@datadir@/glib-2.0/gettext | ||
20 | |||
21 | while test $# -gt 0; do | ||
22 | case "$1" in | ||