diff options
author | Ross Burton <ross@openedhand.com> | 2008-07-27 16:35:21 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-07-27 16:35:21 +0000 |
commit | 76d54d6d937be68ce5e3e6f69f1a1c7841e4de4b (patch) | |
tree | 46302c24468e9e866f320bc9704a71f3efd0dd90 /meta/packages/glib-2.0/glib-2.0-2.16.5 | |
parent | a4c341ad789a8a58127098faff70c85df95cb062 (diff) | |
download | poky-76d54d6d937be68ce5e3e6f69f1a1c7841e4de4b.tar.gz |
glib-2.0: upgrade to 2.16.5
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4964 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/glib-2.0/glib-2.0-2.16.5')
-rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch | 34 | ||||
-rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch | 11 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch new file mode 100644 index 0000000000..3ba79b8986 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.16.5/configure-libtool.patch | |||
@@ -0,0 +1,34 @@ | |||
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.16.5/glib-gettextize-dir.patch b/meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch new file mode 100644 index 0000000000..efe3325578 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0-2.16.5/glib-gettextize-dir.patch | |||
@@ -0,0 +1,11 @@ | |||
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 | ||