diff options
| author | Ross Burton <ross@openedhand.com> | 2008-07-27 16:55:02 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2008-07-27 16:55:02 +0000 |
| commit | 7a5b0f099d07ddb7bb8d35d583af40ef934f1335 (patch) | |
| tree | 0640276cb72b3d0cf0f820c3e3ef354b6e38ed73 /meta/packages/glib-2.0/glib-2.0-2.17.4 | |
| parent | 76d54d6d937be68ce5e3e6f69f1a1c7841e4de4b (diff) | |
| download | openembedded-core-7a5b0f099d07ddb7bb8d35d583af40ef934f1335.tar.gz openembedded-core-7a5b0f099d07ddb7bb8d35d583af40ef934f1335.tar.bz2 openembedded-core-7a5b0f099d07ddb7bb8d35d583af40ef934f1335.zip | |
glib-2.0: upgrade bleeding to 2.17.4
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4965 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/glib-2.0/glib-2.0-2.17.4')
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.17.4/configure-libtool.patch | 34 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.17.4/glib-gettextize-dir.patch | 11 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.17.4/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.17.4/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.17.4/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 diff --git a/meta/packages/glib-2.0/glib-2.0-2.17.4/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.17.4/glib-gettextize-dir.patch new file mode 100644 index 0000000000..efe3325578 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.17.4/glib-gettextize-dir.patch @@ -0,0 +1,11 @@ +--- glib-2.10.3/glib-gettextize.in.old 2006-06-21 12:46:45.000000000 +0100 ++++ glib-2.10.3/glib-gettextize.in 2006-06-21 12:48:14.000000000 +0100 +@@ -49,7 +49,7 @@ + ;; + esac + +-gettext_dir=$prefix/share/glib-2.0/gettext ++gettext_dir=@datadir@/glib-2.0/gettext + + while test $# -gt 0; do + case "$1" in |