diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2010-11-22 14:26:56 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-27 21:52:01 +0000 |
commit | 7c9c78bebd074d72270adaa8baed860bf554ad82 (patch) | |
tree | e28a5c7033d9ee973c96674e733c592f9724be0a /meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch | |
parent | 8a6e8623b43a5b38546e0a8c96f473dba9b31eee (diff) | |
download | poky-7c9c78bebd074d72270adaa8baed860bf554ad82.tar.gz |
gtk+: Update to 2.22.1
Remove disable-gio-png-sniff-test.diff as it alreay in upstream. gdk-pixbuf in
gtk+ is separated as another stand-alone package, so remove it.
In future need only pick up stable version(even number like 2.20.x, 2.22.x).
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch')
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch new file mode 100644 index 0000000000..7937ef2d07 --- /dev/null +++ b/meta/recipes-gnome/gtk+/gtk+-2.22.1/hardcoded_libtool.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Index: gtk+-2.23.2/configure.in | ||
2 | =================================================================== | ||
3 | --- gtk+-2.23.2.orig/configure.in 2010-11-10 22:22:47.000000000 +0800 | ||
4 | +++ gtk+-2.23.2/configure.in 2010-11-25 13:32:40.000000000 +0800 | ||
5 | @@ -414,7 +414,7 @@ | ||
6 | case $enable_explicit_deps in | ||
7 | auto) | ||
8 | export SED | ||
9 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
10 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | ||
11 | if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then | ||
12 | enable_explicit_deps=yes | ||
13 | else | ||
14 | @@ -773,7 +773,7 @@ | ||
15 | dnl Now we check to see if our libtool supports shared lib deps | ||
16 | dnl (in a rather ugly way even) | ||
17 | if $dynworks; then | ||
18 | - module_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" | ||
19 | + module_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" | ||
20 | module_deplibs_check=`$module_libtool_config | \ | ||
21 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | ||
22 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | ||
23 | @@ -1555,7 +1555,7 @@ | ||
24 | # We are using gmodule-no-export now, but I'm leaving the stripping | ||
25 | # code in place for now, since pango and atk still require gmodule. | ||
26 | export SED | ||
27 | -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
28 | +export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` | ||
29 | if test -n "$export_dynamic"; then | ||
30 | GDK_DEP_LIBS=`echo $GDK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||
31 | GTK_DEP_LIBS=`echo $GTK_DEP_LIBS | sed -e "s/$export_dynamic//"` | ||