diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-07-07 09:41:47 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-07 09:41:47 +0000 |
| commit | 2df9f2514bd102fa98b2579a6d1f38ef7e9c0aba (patch) | |
| tree | 68adefebe24fb58155cf00c4c624c4cedf3b4b9d /packages/gtk+/gtk+-2.10.0 | |
| parent | 9e7357192f5b635576a412aba335a2677ea5964c (diff) | |
glib-2.0_2.12.0.bb, gtk+_2.10.0.bb : rediff and add the patches to fix
the hardcoded libtool path in both these packages configure.in as they
are essential.
Both are running on my c7x0 now so they have at least been tested.
Diffstat (limited to 'packages/gtk+/gtk+-2.10.0')
| -rw-r--r-- | packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch index b2afddcc61..bdbdb32f97 100644 --- a/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch +++ b/packages/gtk+/gtk+-2.10.0/hardcoded_libtool.patch @@ -1,29 +1,29 @@ ---- gtk+-2.6.0/configure.in.old 2005-01-01 16:23:45.000000000 +0000 -+++ gtk+-2.6.0/configure.in 2005-01-01 16:24:03.000000000 +0000 -@@ -360,7 +360,7 @@ +--- gtk+-2.10.0/configure.in.orig 2006-07-07 09:31:34.000000000 +0100 ++++ gtk+-2.10.0/configure.in 2006-07-07 09:32:49.000000000 +0100 +@@ -370,7 +370,7 @@ AC_MSG_CHECKING([Whether to write dependencies into .pc files]) case $enable_explicit_deps in auto) -- deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh` -+ deplib_check_method=`($host_alias-libtool --config; echo eval echo \\$deplib_check_method) | sh` - if test "X$deplib_check_method" = Xnone || test "x$enable_static" = xyes ; then +- deplibs_check_method=`(./libtool --config; echo eval echo \\$deplibs_check_method) | sh` ++ deplibs_check_method=`(./$host_alias-libtool --config; echo eval echo \\$deplibs_check_method) | sh` + if test "x$deplibs_check_method" '!=' xpass_all || test "x$enable_static" = xyes ; then enable_explicit_deps=yes else -@@ -688,7 +688,7 @@ +@@ -768,7 +768,7 @@ dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then - pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./libtool --config" -+ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} $host_alias-libtool --config" ++ pixbuf_libtool_config="${CONFIG_SHELL-/bin/sh} ./$host_alias-libtool --config" pixbuf_deplibs_check=`$pixbuf_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1512,7 +1512,7 @@ +@@ -1600,7 +1600,7 @@ # # We are using gmodule-no-export now, but I'm leaving the stripping # code in place for now, since pango and atk still require gmodule. -export_dynamic=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` -+export_dynamic=`($host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` ++export_dynamic=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh` if test -n "$export_dynamic"; then GDK_PIXBUF_DEP_LIBS=`echo $GDK_PIXBUF_DEP_LIBS | sed -e "s/$export_dynamic//"` GDK_PIXBUF_XLIB_DEP_LIBS=`echo $GDK_PIXBUF_XLIB_DEP_LIBS | sed -e "s/$export_dynamic//"` |