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.22.3 | |
| parent | 6b81c6dbb55d57a0f8d96ee5e3f5d1e6148850b1 (diff) | |
| download | poky-31180a56d1b6981fa9d5588ad3538f34e339e0fe.tar.gz | |
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.22.3')
3 files changed, 0 insertions, 51 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch deleted file mode 100644 index 3ba79b8986..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.22.3/configure-libtool.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 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 | |||
| 6 | --- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 | ||
| 7 | +++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 | ||
| 8 | @@ -1174,7 +1174,7 @@ | ||
| 9 | G_MODULE_LDFLAGS= | ||
| 10 | else | ||
| 11 | export SED | ||
| 12 | - G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
| 13 | + G_MODULE_LDFLAGS=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
| 14 | fi | ||
| 15 | dnl G_MODULE_IMPL= don't reset, so cmd-line can override | ||
| 16 | G_MODULE_NEED_USCORE=0 | ||
| 17 | @@ -1265,7 +1265,7 @@ | ||
| 18 | LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" | ||
| 19 | dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness | ||
| 20 | echo "void glib_plugin_test(void) { }" > plugin.c | ||
| 21 | - ${SHELL} ./libtool --mode=compile ${CC} -shared \ | ||
| 22 | + ${SHELL} $host_alias-libtool --mode=compile ${CC} -shared \ | ||
| 23 | -export-dynamic -o plugin.o plugin.c 2>&1 >/dev/null | ||
| 24 | AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], | ||
| 25 | glib_cv_rtldglobal_broken,[ | ||
| 26 | @@ -1339,7 +1339,7 @@ | ||
| 27 | |||
| 28 | AC_MSG_CHECKING(for the suffix of shared libraries) | ||
| 29 | export SED | ||
| 30 | -shrext_cmds=`./libtool --config | grep '^shrext_cmds='` | ||
| 31 | +shrext_cmds=`$host_alias-libtool --config | grep '^shrext_cmds='` | ||
| 32 | eval $shrext_cmds | ||
| 33 | module=yes eval std_shrext=$shrext_cmds | ||
| 34 | # chop the initial dot | ||
diff --git a/meta/packages/glib-2.0/glib-2.0-2.22.3/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.22.3/glib-gettextize-dir.patch deleted file mode 100644 index efe3325578..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.22.3/glib-gettextize-dir.patch +++ /dev/null | |||
| @@ -1,11 +0,0 @@ | |||
| 1 | --- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100 | ||
| 2 | +++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100 | ||
| 3 | @@ -49,7 +49,7 @@ | ||
| 4 | ;; | ||
| 5 | esac | ||
| 6 | |||
| 7 | -gettext_dir=$prefix/share/glib-2.0/gettext | ||
| 8 | +gettext_dir=@datadir@/glib-2.0/gettext | ||
| 9 | |||
| 10 | while test $# -gt 0; do | ||
| 11 | case "$1" in | ||
diff --git a/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h b/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h deleted file mode 100644 index 1329e7f21c..0000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.22.3/glibconfig-sysdefs.h +++ /dev/null | |||
| @@ -1,6 +0,0 @@ | |||
| 1 | #define GLIB_SYSDEF_POLLIN =1 | ||
| 2 | #define GLIB_SYSDEF_POLLOUT =4 | ||
| 3 | #define GLIB_SYSDEF_POLLPRI =2 | ||
| 4 | #define GLIB_SYSDEF_POLLERR =8 | ||
| 5 | #define GLIB_SYSDEF_POLLHUP =16 | ||
| 6 | #define GLIB_SYSDEF_POLLNVAL =32 | ||
