diff options
| author |   Koen Kooi <koen@openembedded.org> | 2008-06-02 16:25:56 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-06-02 16:25:56 +0000 |
| commit | 14ccfbe5dcdf312eb74384ef491c31ef57721072 (patch) | |
| tree | ac222b8de838e086d46cac7d76c1df5ae07f4f58 | |
| parent | 8e15ffa6cbc1c404d2c06be004481c07c5496a83 (diff) | |
| download | openembedded-14ccfbe5dcdf312eb74384ef491c31ef57721072.tar.gz | |
gtk 2.12.3: merge libtool patch with poky
| -rw-r--r-- | packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch | 6 | ||||
| -rw-r--r-- | packages/gtk+/gtk+_2.12.3.bb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch b/packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch index 6adb0cfef6..1c2cd0576d 100644 --- a/packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch +++ b/packages/gtk+/gtk+-2.12.3/hardcoded_libtool.patch @@ -5,7 +5,7 @@ auto) 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` ++ 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 @@ -14,7 +14,7 @@ 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/'` @@ -23,7 +23,7 @@ # 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` ++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//"` diff --git a/packages/gtk+/gtk+_2.12.3.bb b/packages/gtk+/gtk+_2.12.3.bb index 3d3bd0c8cf..7f2074b96c 100644 --- a/packages/gtk+/gtk+_2.12.3.bb +++ b/packages/gtk+/gtk+_2.12.3.bb @@ -1,6 +1,6 @@ require gtk+.inc -PR = "r1" +PR = "r2" DEPENDS += "cairo" |