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/configure-libtool.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/configure-libtool.patch')
-rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch new file mode 100644 index 000000000..3ba79b898 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.24.1/configure-libtool.patch @@ -0,0 +1,34 @@ +# 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 + +--- glib-2.12.10/configure.in.orig 2006-06-05 13:34:08.000000000 +0100 ++++ glib-2.12.10/configure.in 2006-06-05 13:34:36.000000000 +0100 +@@ -1174,7 +1174,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 +@@ -1265,7 +1265,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,[ +@@ -1339,7 +1339,7 @@ + + AC_MSG_CHECKING(for the suffix of 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 |