diff options
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch index 1ae728e70d..9eb7f6bf5c 100644 --- a/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch +++ b/meta/recipes-gnome/gtk+/gtk+/hardcoded_libtool.patch | |||
@@ -3,19 +3,20 @@ Upstream-Status: Inappropriate [embedded specific] | |||
3 | Updated to apply to gtk+-2.24.15 | 3 | Updated to apply to gtk+-2.24.15 |
4 | 4 | ||
5 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> | 5 | Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> |
6 | diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac | 6 | Index: gtk+-2.24.31/configure.ac |
7 | --- gtk+-2.24.15/configure.ac 2013-01-12 20:52:54.000000000 +0200 | 7 | =================================================================== |
8 | +++ gtk+-2.24.15/configure.ac 2013-02-12 21:33:30.689925967 +0200 | 8 | --- gtk+-2.24.31.orig/configure.ac |
9 | @@ -415,7 +415,7 @@ | 9 | +++ gtk+-2.24.31/configure.ac |
10 | @@ -415,7 +415,7 @@ AC_MSG_CHECKING([Whether to write depend | ||
10 | case $enable_explicit_deps in | 11 | case $enable_explicit_deps in |
11 | auto) | 12 | auto) |
12 | export SED | 13 | export SED |
13 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | 14 | - deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` |
14 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` | 15 | + deplibs_check_method=`(./$host_alias-libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh` |
15 | if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then | 16 | if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then |
16 | enable_explicit_deps=yes | 17 | enable_explicit_deps=yes |
17 | else | 18 | else |
18 | @@ -774,7 +774,7 @@ | 19 | @@ -772,7 +772,7 @@ else |
19 | dnl Now we check to see if our libtool supports shared lib deps | 20 | dnl Now we check to see if our libtool supports shared lib deps |
20 | dnl (in a rather ugly way even) | 21 | dnl (in a rather ugly way even) |
21 | if $dynworks; then | 22 | if $dynworks; then |
@@ -24,7 +25,7 @@ diff -Nurd gtk+-2.24.15/configure.ac gtk+-2.24.15/configure.ac | |||
24 | module_deplibs_check=`$module_libtool_config | \ | 25 | module_deplibs_check=`$module_libtool_config | \ |
25 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ | 26 | grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ |
26 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` | 27 | sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` |
27 | @@ -1574,7 +1574,7 @@ | 28 | @@ -1579,7 +1579,7 @@ fi |
28 | # We are using gmodule-no-export now, but I'm leaving the stripping | 29 | # We are using gmodule-no-export now, but I'm leaving the stripping |
29 | # code in place for now, since pango and atk still require gmodule. | 30 | # code in place for now, since pango and atk still require gmodule. |
30 | export SED | 31 | export SED |