diff options
| author |   Koen Kooi <koen@openembedded.org> | 2007-01-08 16:54:15 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-01-08 16:54:15 +0000 |
| commit | 5d2e5495a7a97758399f782db21d5a491b3288be (patch) | |
| tree | 9ac09852cc364942680ab5c662b6277cb85bed72 /packages/gtk+ | |
| parent | 6d85754a1b9aa052f5a4cd7b23c43110ea15638c (diff) | |
| download | openembedded-5d2e5495a7a97758399f782db21d5a491b3288be.tar.gz | |
gtk 2.10.7: rediffed hardcoded-libtool.patch
Diffstat (limited to 'packages/gtk+')
| -rw-r--r-- | packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch | 18 | ||||
| -rw-r--r-- | packages/gtk+/gtk+_2.10.7.bb | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch index bdbdb32f97..6adb0cfef6 100644 --- a/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch +++ b/packages/gtk+/gtk+-2.10.7/hardcoded_libtool.patch @@ -1,15 +1,15 @@ ---- 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]) +--- /tmp/configure.in 2007-01-08 17:50:49.000000000 +0100 ++++ gtk+-2.10.7/configure.in 2007-01-08 17:52:33.495251000 +0100 +@@ -371,7 +371,7 @@ case $enable_explicit_deps in auto) -- 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` + export SED +- 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 -@@ -768,7 +768,7 @@ +@@ -773,7 +773,7 @@ dnl Now we check to see if our libtool supports shared lib deps dnl (in a rather ugly way even) if $dynworks; then @@ -18,10 +18,10 @@ pixbuf_deplibs_check=`$pixbuf_libtool_config | \ grep '^[[a-z_]]*check[[a-z_]]*_method=[['\''"]]' | \ sed 's/.*[['\''"]]\(.*\)[['\''"]]$/\1/'` -@@ -1600,7 +1600,7 @@ - # +@@ -1611,7 +1611,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 SED -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` if test -n "$export_dynamic"; then diff --git a/packages/gtk+/gtk+_2.10.7.bb b/packages/gtk+/gtk+_2.10.7.bb index 7f0fc4e172..f78b9d459c 100644 --- a/packages/gtk+/gtk+_2.10.7.bb +++ b/packages/gtk+/gtk+_2.10.7.bb @@ -16,7 +16,7 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://small-gtkfilesel.patch;patch=1 \ file://migration.patch;patch=1;pnum=0 \ file://run-iconcache.patch;patch=1 \ -# file://hardcoded_libtool.patch;patch=1 \ + file://hardcoded_libtool.patch;patch=1 \ file://no-demos.patch;patch=1 \ file://single-click.patch;patch=1 \ file://spinbutton.patch;patch=1 \ |